pg_query 2.0.3 → 5.1.0

data/ext/pg_query/include/protobuf-c/protobuf-c.h

@@ -238,7 +238,11 @@ PROTOBUF_C__BEGIN_DECLS
 #define PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC       0x114315af
 
 /* Empty string used for initializers */
+#if defined(_WIN32) && defined(PROTOBUF_C_USE_SHARED_LIB)
+static const char protobuf_c_empty_string[] = "";
+#else
 extern const char protobuf_c_empty_string[];
+#endif
 
 /**
  * \defgroup api Public API
@@ -790,13 +794,13 @@ protobuf_c_version_number(void);
  * The version of the protobuf-c headers, represented as a string using the same
  * format as protobuf_c_version().
  */
-#define PROTOBUF_C_VERSION		"1.3.3"
+#define PROTOBUF_C_VERSION		"1.4.0"
 
 /**
  * The version of the protobuf-c headers, represented as an integer using the
  * same format as protobuf_c_version_number().
  */
-#define PROTOBUF_C_VERSION_NUMBER	1003003
+#define PROTOBUF_C_VERSION_NUMBER	1004000
 
 /**
  * The minimum protoc-c version which works with the current version of the
@@ -1103,4 +1107,4 @@ protobuf_c_service_invoke_internal(
 
 PROTOBUF_C__END_DECLS
 
-#endif /* PROTOBUF_C_H */
+#endif /* PROTOBUF_C_H */

data/ext/pg_query/include/protobuf-c.h

@@ -238,7 +238,11 @@ PROTOBUF_C__BEGIN_DECLS
 #define PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC       0x114315af
 
 /* Empty string used for initializers */
+#if defined(_WIN32) && defined(PROTOBUF_C_USE_SHARED_LIB)
+static const char protobuf_c_empty_string[] = "";
+#else
 extern const char protobuf_c_empty_string[];
+#endif
 
 /**
  * \defgroup api Public API
@@ -790,13 +794,13 @@ protobuf_c_version_number(void);
  * The version of the protobuf-c headers, represented as a string using the same
  * format as protobuf_c_version().
  */
-#define PROTOBUF_C_VERSION		"1.3.3"
+#define PROTOBUF_C_VERSION		"1.4.0"
 
 /**
  * The version of the protobuf-c headers, represented as an integer using the
  * same format as protobuf_c_version_number().
  */
-#define PROTOBUF_C_VERSION_NUMBER	1003003
+#define PROTOBUF_C_VERSION_NUMBER	1004000
 
 /**
  * The minimum protoc-c version which works with the current version of the
@@ -1103,4 +1107,4 @@ protobuf_c_service_invoke_internal(
 
 PROTOBUF_C__END_DECLS
 
-#endif /* PROTOBUF_C_H */
+#endif /* PROTOBUF_C_H */

data/ext/pg_query/pg_query.c

@@ -5,15 +5,20 @@
 #include <utils/memutils.h>
 #include <utils/memdebug.h>
 
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
+#endif
+
 #include <signal.h>
 
 const char* progname = "pg_query";
 
 __thread sig_atomic_t pg_query_initialized = 0;
 
+#ifdef HAVE_PTHREAD
 static pthread_key_t pg_query_thread_exit_key;
 static void pg_query_thread_exit(void *key);
+#endif
 
 void pg_query_init(void)
 {
@@ -23,13 +28,15 @@ void pg_query_init(void)
 	MemoryContextInit();
 	SetDatabaseEncoding(PG_UTF8);
 
+#ifdef HAVE_PTHREAD
 	pthread_key_create(&pg_query_thread_exit_key, pg_query_thread_exit);
 	pthread_setspecific(pg_query_thread_exit_key, TopMemoryContext);
+#endif
 }
 
 void pg_query_free_top_memory_context(MemoryContext context)
 {
-	AssertArg(MemoryContextIsValid(context));
+	Assert(MemoryContextIsValid(context));
 
 	/*
 	 * After this, no memory contexts are valid anymore, so ensure that
@@ -55,11 +62,13 @@ void pg_query_free_top_memory_context(MemoryContext context)
 	ErrorContext = NULL;
 }
 
+#ifdef HAVE_PTHREAD
 static void pg_query_thread_exit(void *key)
 {
 	MemoryContext context = (MemoryContext) key;
 	pg_query_free_top_memory_context(context);
 }
+#endif
 
 void pg_query_exit(void)
 {