[Groonga-commit] groonga/groonga at c1f6ebb [master] Define "inline" iff __cplusplus is not defined.

Back to archive index

susumu.yata null+****@clear*****
Wed Nov 6 19:02:47 JST 2013


susumu.yata	2013-11-06 19:02:47 +0900 (Wed, 06 Nov 2013)

  New Revision: c1f6ebb9f7f2e2370b1d455df3ae32515f221494
  https://github.com/groonga/groonga/commit/c1f6ebb9f7f2e2370b1d455df3ae32515f221494

  Message:
    Define "inline" iff __cplusplus is not defined.
    
    To avoid VC++ error C1189.

  Modified files:
    lib/groonga_in.h

  Modified: lib/groonga_in.h (+4 -2)
===================================================================
--- lib/groonga_in.h    2013-11-06 13:48:36 +0900 (f3d27bd)
+++ lib/groonga_in.h    2013-11-06 19:02:47 +0900 (51e5c82)
@@ -113,8 +113,10 @@
 #include <sys/types.h>
 
 #ifndef __GNUC__
-#define PATH_MAX (MAX_PATH - 1)
-#define inline _inline
+# define PATH_MAX (MAX_PATH - 1)
+# ifndef __cplusplus
+#  define inline _inline
+# endif
 #endif
 
 #define snprintf(str, size, ...) _snprintf(str, size, __VA_ARGS__)
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index