Kouhei Sutou
null+****@clear*****
Mon Jun 8 21:15:27 JST 2015
Kouhei Sutou 2015-06-08 21:15:27 +0900 (Mon, 08 Jun 2015) New Revision: 2e5072f777eb31a013180e0e09da2041ac5379fb https://github.com/groonga/groonga/commit/2e5072f777eb31a013180e0e09da2041ac5379fb Message: Fix wrong macro to include netinet/in.h GitHub: fix #348 Reported by OBATA Akio. Thanks!!! Modified files: src/grnslap.c src/groonga.c src/groonga_benchmark.c Modified: src/grnslap.c (+2 -2) =================================================================== --- src/grnslap.c 2015-06-04 20:29:02 +0900 (2f5562f) +++ src/grnslap.c 2015-06-08 21:15:27 +0900 (4e03965) @@ -23,9 +23,9 @@ #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif /* HAVE_SYS_WAIT_H */ -#ifdef HAVE_NETINET_IN_H +#ifndef WIN32 #include <netinet/in.h> -#endif /* HAVE_NETINET_IN_H */ +#endif /* WIN32 */ #define DEFAULT_PORT 10041 #define DEFAULT_HOST "localhost" Modified: src/groonga.c (+2 -2) =================================================================== --- src/groonga.c 2015-06-04 20:29:02 +0900 (0e94725) +++ src/groonga.c 2015-06-08 21:15:27 +0900 (7259095) @@ -39,9 +39,9 @@ #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif /* HAVE_SYS_SOCKET_H */ -#ifdef HAVE_NETINET_IN_H +#ifndef WIN32 # include <netinet/in.h> -#endif /* HAVE_NETINET_IN_H */ +#endif /* WIN32 */ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> Modified: src/groonga_benchmark.c (+2 -2) =================================================================== --- src/groonga_benchmark.c 2015-06-04 20:29:02 +0900 (656984a) +++ src/groonga_benchmark.c 2015-06-08 21:15:27 +0900 (edff5f2) @@ -33,9 +33,9 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif /* HAVE_SYS_SOCKET_H */ -#ifdef HAVE_NETINET_IN_H +#ifndef WIN32 #include <netinet/in.h> -#endif /* HAVE_NETINET_IN_H */ +#endif /* WIN32 */ #include <grn_str.h> #include <grn_com.h> -------------- next part -------------- HTML����������������������������...Download