Kouhei Sutou
null+****@clear*****
Wed May 6 16:51:36 JST 2015
Kouhei Sutou 2015-05-06 16:51:36 +0900 (Wed, 06 May 2015) New Revision: e90dc1b7aac0b2f2751c2f120dfaecefd544db1f https://github.com/groonga/groonga/commit/e90dc1b7aac0b2f2751c2f120dfaecefd544db1f Message: Assume that netinet/in.h exists on non Windows environment Modified files: build/ac_macros/check_headers.m4 config.h.cmake lib/com.c lib/ctx.c Modified: build/ac_macros/check_headers.m4 (+0 -1) =================================================================== --- build/ac_macros/check_headers.m4 2015-05-03 13:26:46 +0900 (cb058a8) +++ build/ac_macros/check_headers.m4 2015-05-06 16:51:36 +0900 (a62fd10) @@ -6,7 +6,6 @@ AC_CHECK_HEADERS(errno.h) AC_CHECK_HEADERS(execinfo.h) AC_CHECK_HEADERS(inttypes.h) AC_CHECK_HEADERS(netdb.h) -AC_CHECK_HEADERS(netinet/in.h) AC_CHECK_HEADERS(netinet/tcp.h) AC_CHECK_HEADERS(signal.h) AC_CHECK_HEADERS(stdarg.h) Modified: config.h.cmake (+0 -1) =================================================================== --- config.h.cmake 2015-05-03 13:26:46 +0900 (83a6542) +++ config.h.cmake 2015-05-06 16:51:36 +0900 (b16cd7c) @@ -101,7 +101,6 @@ #cmakedefine HAVE_LINUX_FUTEX_H #cmakedefine HAVE_MEMORY_H #cmakedefine HAVE_NETDB_H -#cmakedefine HAVE_NETINET_IN_H #cmakedefine HAVE_NETINET_TCP_H #cmakedefine HAVE_PTHREAD_H #cmakedefine HAVE_SIGNAL_H Modified: lib/com.c (+1 -3) =================================================================== --- lib/com.c 2015-05-03 13:26:46 +0900 (4540cc3) +++ lib/com.c 2015-05-06 16:51:36 +0900 (83c4b8d) @@ -27,9 +27,7 @@ # ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> # endif /* HAVE_SYS_SOCKET_H */ -# ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -# endif /* HAVE_NETINET_IN_H */ +# include <netinet/in.h> # ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> # endif /* HAVE_NETINET_TCP_H */ Modified: lib/ctx.c (+2 -3) =================================================================== --- lib/ctx.c 2015-05-03 13:26:46 +0900 (8587803) +++ lib/ctx.c 2015-05-06 16:51:36 +0900 (765559f) @@ -31,12 +31,11 @@ #include <stdio.h> #include <stdarg.h> #include <time.h> -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif /* HAVE_NETINET_IN_H */ #ifdef WIN32 # include <share.h> +#else /* WIN32 */ +# include <netinet/in.h> #endif /* WIN32 */ #if defined(HAVE__LOCALTIME64_S) && defined(__GNUC__) -------------- next part -------------- HTML����������������������������...Download