浏览代码

Merge pull request #3 from snations/snations

Unconditionally undef WINDOWS_LEAN_AND_MEAN. This makes things build
bel2125 11 年之前
父节点
当前提交
66ed585ef6
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      src/civetweb.c

+ 5 - 1
src/civetweb.c

@@ -44,7 +44,7 @@
 
 /* Disable WIN32_LEAN_AND_MEAN.
    This makes windows.h always include winsock2.h */
-#if defined(WIN32_LEAN_AND_MEAN) && (_MSC_VER <= 1400)
+#if defined(WIN32_LEAN_AND_MEAN)
 #undef WIN32_LEAN_AND_MEAN
 #endif
 
@@ -261,6 +261,10 @@ struct pollfd {
 #include <inttypes.h>
 #include <netdb.h>
 
+#if defined(ANDROID)
+typedef unsigned short int in_port_t;
+#endif
+
 #include <pwd.h>
 #include <unistd.h>
 #include <dirent.h>