Kouhei Sutou
null+****@clear*****
Fri Jul 24 17:47:24 JST 2015
Kouhei Sutou 2015-07-24 17:47:24 +0900 (Fri, 24 Jul 2015) New Revision: 50ab993e40bfb9b4711c270aa56d4de47cc00439 https://github.com/groonga/groonga/commit/50ab993e40bfb9b4711c270aa56d4de47cc00439 Message: Always use stdint.h Because Microsoft Visual C++ 2013 includes stdint.h. Groonga supports Microsoft Visual C++ 2013 or later. Modified files: build/ac_macros/check_headers.m4 config.h.cmake include/groonga/groonga.h lib/grn.h Modified: build/ac_macros/check_headers.m4 (+0 -1) =================================================================== --- build/ac_macros/check_headers.m4 2015-07-24 17:34:49 +0900 (9a30ca8) +++ build/ac_macros/check_headers.m4 2015-07-24 17:47:24 +0900 (7ee4730) @@ -8,7 +8,6 @@ AC_CHECK_HEADERS(inttypes.h) AC_CHECK_HEADERS(netdb.h) AC_CHECK_HEADERS(signal.h) AC_CHECK_HEADERS(stdarg.h) -AC_CHECK_HEADERS(stdint.h) AC_CHECK_HEADERS(string.h) AC_CHECK_HEADERS(strings.h) AC_CHECK_HEADERS(sys/mman.h) Modified: config.h.cmake (+0 -1) =================================================================== --- config.h.cmake 2015-07-24 17:34:49 +0900 (8e3bdaf) +++ config.h.cmake 2015-07-24 17:47:24 +0900 (1d5c834) @@ -104,7 +104,6 @@ #cmakedefine HAVE_PTHREAD_H #cmakedefine HAVE_SIGNAL_H #cmakedefine HAVE_STDARG_H -#cmakedefine HAVE_STDINT_H #cmakedefine HAVE_STRINGS_H #cmakedefine HAVE_STRING_H #cmakedefine HAVE_SYS_MMAN_H Modified: include/groonga/groonga.h (+1 -0) =================================================================== --- include/groonga/groonga.h 2015-07-24 17:34:49 +0900 (14b21bd) +++ include/groonga/groonga.h 2015-07-24 17:47:24 +0900 (6c08593) @@ -20,6 +20,7 @@ #include <stdarg.h> #include <sys/types.h> +#include <stdint.h> #ifdef __cplusplus extern "C" { Modified: lib/grn.h (+2 -17) =================================================================== --- lib/grn.h 2015-07-24 17:34:49 +0900 (711767d) +++ lib/grn.h 2015-07-24 17:47:24 +0900 (dbe9433) @@ -32,10 +32,7 @@ #endif #include <stdlib.h> - -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif /* HAVE_STDINT_H */ +#include <stdint.h> #include <sys/types.h> @@ -106,19 +103,7 @@ # define strcasecmp(s1, s2) _stricmp(s1, s2) # endif /* defined(HAVE__STRICMP) */ -# ifdef __GNUC__ -# include <stdint.h> -# else -typedef UINT8 uint8_t; -typedef INT8 int8_t; -typedef INT8 int_least8_t; -typedef UINT8 uint_least8_t; -typedef INT16 int16_t; -typedef UINT16 uint16_t; -typedef INT32 int32_t; -typedef UINT32 uint32_t; -typedef INT64 int64_t; -typedef UINT64 uint64_t; +# ifndef __GNUC__ typedef SSIZE_T ssize_t; typedef int pid_t; typedef int64_t off64_t; -------------- next part -------------- HTML����������������������������...Download