avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bru...@apache.org
Subject svn commit: r1057735 - in /avro/trunk/lang/c/jansson/src: hashtable.c utf.h value.c
Date Tue, 11 Jan 2011 17:15:50 GMT
Author: brucem
Date: Tue Jan 11 17:15:49 2011
New Revision: 1057735

URL: http://svn.apache.org/viewvc?rev=1057735&view=rev
Log:
AVRO-729. Follow-on to address issues when building with CMake.

Modified:
    avro/trunk/lang/c/jansson/src/hashtable.c
    avro/trunk/lang/c/jansson/src/utf.h
    avro/trunk/lang/c/jansson/src/value.c

Modified: avro/trunk/lang/c/jansson/src/hashtable.c
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/jansson/src/hashtable.c?rev=1057735&r1=1057734&r2=1057735&view=diff
==============================================================================
--- avro/trunk/lang/c/jansson/src/hashtable.c (original)
+++ avro/trunk/lang/c/jansson/src/hashtable.c Tue Jan 11 17:15:49 2011
@@ -5,7 +5,9 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include "hashtable.h"

Modified: avro/trunk/lang/c/jansson/src/utf.h
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/jansson/src/utf.h?rev=1057735&r1=1057734&r2=1057735&view=diff
==============================================================================
--- avro/trunk/lang/c/jansson/src/utf.h (original)
+++ avro/trunk/lang/c/jansson/src/utf.h Tue Jan 11 17:15:49 2011
@@ -8,6 +8,7 @@
 #ifndef UTF_H
 #define UTF_H
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
 
 #ifdef HAVE_INTTYPES_H
@@ -15,7 +16,17 @@
 no need to include stdint.h separately. If inttypes.h doesn't define
 int32_t, it's defined in config.h. */
 #include <inttypes.h>
-#endif
+#endif /* HAVE_INTTYPES_H */
+
+#else /* !HAVE_CONFIG_H */
+#ifdef _WIN32
+typedef int int32_t;
+#else /* !_WIN32 */
+/* Assume a standard environment */
+#include <inttypes.h>
+#endif /* _WIN32 */
+
+#endif /* HAVE_CONFIG_H */
 
 int utf8_encode(int codepoint, char *buffer, int *size);
 

Modified: avro/trunk/lang/c/jansson/src/value.c
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/jansson/src/value.c?rev=1057735&r1=1057734&r2=1057735&view=diff
==============================================================================
--- avro/trunk/lang/c/jansson/src/value.c (original)
+++ avro/trunk/lang/c/jansson/src/value.c Tue Jan 11 17:15:49 2011
@@ -7,7 +7,9 @@
 
 #define _GNU_SOURCE
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>



Mime
View raw message