Suppress compiler warning in non-threaded build.

tglsfdc · tglsfdc · commit b3ab9b45dab8 · 2007-10-03T16:03:25.000Z
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -1,6 +1,6 @@
 /* dynamic SQL support routines
  *
- * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.26 2007/10/03 11:11:12 meskes Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.27 2007/10/03 16:03:25 tgl Exp $
  */
 
 #define POSTGRES_ECPG_INTERNAL
@@ -16,13 +16,14 @@
 #include "sql3types.h"
 
 static void descriptor_free(struct descriptor *desc);
-static void descriptor_deallocate_all(struct descriptor *list);
 
 /* We manage descriptors separately for each thread. */
 #ifdef ENABLE_THREAD_SAFETY
 static pthread_key_t	descriptor_key;
 static pthread_once_t	descriptor_once = PTHREAD_ONCE_INIT;
 
+static void descriptor_deallocate_all(struct descriptor *list);
+
 static void
 descriptor_destructor(void *arg)
 {
@@ -653,6 +654,8 @@ ECPGdeallocate_desc(int line, const char *name)
 	return false;
 }
 
+#ifdef ENABLE_THREAD_SAFETY
+
 /* Deallocate all descriptors in the list */
 static void
 descriptor_deallocate_all(struct descriptor *list)
@@ -665,6 +668,8 @@ descriptor_deallocate_all(struct descriptor *list)
 	}
 }
 
+#endif /* ENABLE_THREAD_SAFETY */
+
 bool
 ECPGallocate_desc(int line, const char *name)
 {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* dynamic SQL support routines`
`2`	`2`	`*`
`3`		`- * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.26 2007/10/03 11:11:12 meskes Exp $`
	`3`	`+ * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.27 2007/10/03 16:03:25 tgl Exp $`
`4`	`4`	`*/`
`5`	`5`
`6`	`6`	`#define POSTGRES_ECPG_INTERNAL`
`@@ -16,13 +16,14 @@`
`16`	`16`	`#include "sql3types.h"`
`17`	`17`
`18`	`18`	`static void descriptor_free(struct descriptor *desc);`
`19`		`-static void descriptor_deallocate_all(struct descriptor *list);`
`20`	`19`
`21`	`20`	`/* We manage descriptors separately for each thread. */`
`22`	`21`	`#ifdef ENABLE_THREAD_SAFETY`
`23`	`22`	`static pthread_key_t descriptor_key;`
`24`	`23`	`static pthread_once_t descriptor_once = PTHREAD_ONCE_INIT;`
`25`	`24`
	`25`	`+static void descriptor_deallocate_all(struct descriptor *list);`
	`26`	`+`
`26`	`27`	`static void`
`27`	`28`	`descriptor_destructor(void *arg)`
`28`	`29`	`{`
`@@ -653,6 +654,8 @@ ECPGdeallocate_desc(int line, const char *name)`
`653`	`654`	`return false;`
`654`	`655`	`}`
`655`	`656`
	`657`	`+#ifdef ENABLE_THREAD_SAFETY`
	`658`	`+`
`656`	`659`	`/* Deallocate all descriptors in the list */`
`657`	`660`	`static void`
`658`	`661`	`descriptor_deallocate_all(struct descriptor *list)`
`@@ -665,6 +668,8 @@ descriptor_deallocate_all(struct descriptor *list)`
`665`	`668`	`}`
`666`	`669`	`}`
`667`	`670`
	`671`	`+#endif /* ENABLE_THREAD_SAFETY */`
	`672`	`+`
`668`	`673`	`bool`
`669`	`674`	`ECPGallocate_desc(int line, const char *name)`
`670`	`675`	`{`