Move pg_convert3 declaration to suppress compile warning. Really

tglsfdc · tglsfdc · commit b74f61aabe93 · 2002-08-06T14:11:06.000Z
pg_convert3 does not belong in a backend/catalog file at all, IMHO;
it should be in utils/adt.
diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_conversion.h,v 1.4 2002/08/06 05:40:45 ishii Exp $
+ * $Id: pg_conversion.h,v 1.5 2002/08/06 14:11:06 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -93,6 +93,4 @@ extern void RemoveConversionById(Oid conversionOid);
 extern Oid FindConversion(const char *conname, Oid connamespace);
 extern Oid FindDefaultConversion(Oid connamespace, int4 for_encoding, int4 to_encoding);
 
-extern Datum pg_convert3(PG_FUNCTION_ARGS);
-
 #endif   /* PG_CONVERSION_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.188 2002/07/29 22:14:11 tgl Exp $
+ * $Id: builtins.h,v 1.189 2002/08/06 14:11:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -639,4 +639,7 @@ extern Datum quote_literal(PG_FUNCTION_ARGS);
 extern Datum show_config_by_name(PG_FUNCTION_ARGS);
 extern Datum set_config_by_name(PG_FUNCTION_ARGS);
 
+/* catalog/pg_conversion.c */
+extern Datum pg_convert3(PG_FUNCTION_ARGS);
+
 #endif   /* BUILTINS_H */

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`9`	`9`	`* Portions Copyright (c) 1994, Regents of the University of California`
`10`	`10`	`*`
`11`		`- * $Id: pg_conversion.h,v 1.4 2002/08/06 05:40:45 ishii Exp $`
	`11`	`+ * $Id: pg_conversion.h,v 1.5 2002/08/06 14:11:06 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* the genbki.sh script reads this file and generates .bki`
`@@ -93,6 +93,4 @@ extern void RemoveConversionById(Oid conversionOid);`
`93`	`93`	`extern Oid FindConversion(const char *conname, Oid connamespace);`
`94`	`94`	`extern Oid FindDefaultConversion(Oid connamespace, int4 for_encoding, int4 to_encoding);`
`95`	`95`
`96`		`-extern Datum pg_convert3(PG_FUNCTION_ARGS);`
`97`		`-`
`98`	`96`	`#endif /* PG_CONVERSION_H */`