Use _NEWLIB_VERSION macro to detect newlib.

ports/civetweb/nacl.patch

 diff --git a/Makefile b/Makefile
 index 133a1ef..ecd1e27 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -9,8 +9,8 @@
  
  include resources/Makefile.in-os
  
 -CPROG = civetweb
  #CXXPROG = civetweb
 +CPROG = civetweb
  
  BUILD_DIR = out
  
 @@ -92,7 +92,11 @@ LIB_OBJECTS = $(filter-out $(MAIN_OBJECTS), $(BUILD_OBJECTS))
  
  LIBS = -lpthread -lm
  
 -ifeq ($(TARGET_OS),LINUX) 
 +ifeq ($(TARGET_OS),NACL)
 +       LIBS += -lppapi_simple -lnacl_io -lppapi_cpp -lppapi
 +endif
 +
 +ifeq ($(TARGET_OS),LINUX)
         LIBS += -ldl
  endif
  
 diff --git a/src/civetweb.c b/src/civetweb.c
-index 3cc395a..d1ff233 100644
+index 3cc395a..35ca367 100644
 --- a/src/civetweb.c
 +++ b/src/civetweb.c
-@@ -61,6 +61,13 @@
- #define IGNORE_UNUSED_RESULT(a) (void)((a) && 1)
- #endif
- 
-+#if defined(__native_client__) && !defined(__GLIBC__)
-+// Newlib doesn't currently implemnt flockfile/funlockfile.
-+// TODO(sbc): remove this once newlib is fixed.
-+#define flockfile(x)
-+#define funlockfile(x)
-+#endif
-+
- #ifndef _WIN32_WCE /* Some ANSI #includes are not available on Windows CE */
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -222,7 +229,7 @@ struct pollfd {
+@@ -222,7 +222,7 @@ struct pollfd {
  #else    /* UNIX  specific */
  #include <sys/wait.h>
  #include <sys/socket.h>
 -#include <sys/poll.h>
 +#include <poll.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
  #include <sys/time.h>
+@@ -330,6 +330,13 @@ typedef int socklen_t;
+ #define MGSQLEN 20
+ #endif
+ 
++#if defined(__native_client__) && defined(_NEWLIB_VERSION)
++// Newlib doesn't currently implemnt flockfile/funlockfile.
++// TODO(sbc): remove this once newlib is fixed.
++#define flockfile(x)
++#define funlockfile(x)
++#endif
++
+ static const char *http_500_error = "Internal Server Error";
+ 
+ #if defined(NO_SSL_DL)
 diff --git a/src/main.c b/src/main.c
 index c8dff6e..97d3264 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -69,9 +69,17 @@ extern char *_getcwd(char *buf, size_t size);
  #include <unistd.h>
  #define DIRSEP '/'
  #define WINCDECL
 +#ifdef __native_client__
 +// realpath is currently broken under glibc at least:
@@ skipping 58 matching lines @@
      printf("%s started on port(s) %s with web root [%s]\n",
 @@ -1067,4 +1113,8 @@ int main(int argc, char *argv[])
  
      return EXIT_SUCCESS;
  }
 +
 +#ifdef __native_client__
 +PPAPI_SIMPLE_REGISTER_MAIN(civetweb_main)
 +#endif
  #endif /* _WIN32 */