Rename ecpg's various "extern.h" files to have distinct names.

This should reduce confusion, and in particular make it safe to
copy typename.c into preproc/ and compile it there.

This doesn't affect anything outside ecpg, and particularly not
end users, because these files don't get installed; they just
exist to share declarations among the .c files of each subdirectory.

Discussion: https://postgr.es/m/31364.1543511708@sss.pgh.pa.us

diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index 71fa2753638c83bed53127e279d406b03aa116e1..5f8455020e5ad41a564553123c7d2258183f4b9a 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -7,7 +7,7 @@
 #include "ecpgtype.h"
 #include "ecpglib.h"
 #include "ecpgerrno.h"
-#include "extern.h"
+#include "ecpglib_extern.h"
 #include "sqlca.h"
 
 #ifdef ENABLE_THREAD_SAFETY

diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index f3d326a50b1a4aed7807f6747699ee0cff2ebe81..424b5ae5d54054d88bfa436af71f476962db9b16 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -8,7 +8,7 @@
 #include "ecpgtype.h"
 #include "ecpglib.h"
 #include "ecpgerrno.h"
-#include "extern.h"
+#include "ecpglib_extern.h"
 #include "sqlca.h"
 #include "pgtypes_numeric.h"
 #include "pgtypes_date.h"

diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index 8fdf5606c09cf95d340b4fd8c7cde1c5729fb710..186f92cc3ed07d0a6423adb964cc0fe7d169ab5b 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -12,7 +12,7 @@
 #include "ecpgtype.h"
 #include "ecpglib.h"
 #include "ecpgerrno.h"
-#include "extern.h"
+#include "ecpglib_extern.h"
 #include "sqlca.h"
 #include "sqlda.h"
 #include "sql3types.h"

diff --git a/src/interfaces/ecpg/ecpglib/extern.h b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
similarity index 97%
rename from src/interfaces/ecpg/ecpglib/extern.h
rename to src/interfaces/ecpg/ecpglib/ecpglib_extern.h
index a88f34106cceec5785b74561f04a3e10a0658f78..1c9bce1456d03164307862f206c28a96bc37e394 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/extern.h
+++ b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
@@ -1,7 +1,7 @@
-/* src/interfaces/ecpg/ecpglib/extern.h */
+/* src/interfaces/ecpg/ecpglib/ecpglib_extern.h */
 
-#ifndef _ECPG_LIB_EXTERN_H
-#define _ECPG_LIB_EXTERN_H
+#ifndef _ECPG_ECPGLIB_EXTERN_H
+#define _ECPG_ECPGLIB_EXTERN_H
 
 #include "libpq-fe.h"
 #include "sqlca.h"
@@ -221,4 +221,4 @@ void                ecpg_set_native_sqlda(int, struct sqlda_struct **, const PGresult *, int,
 #define ECPG_SQLSTATE_ECPG_INTERNAL_ERROR      "YE000"
 #define ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY       "YE001"
 
-#endif                                                 /* _ECPG_LIB_EXTERN_H */
+#endif                                                 /* _ECPG_ECPGLIB_EXTERN_H */

diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index f34ae4afb8332d29f4b033eb2d986bd80ea762e7..9c56991a1e82116b4e1eb5f80e1f1c967f5d8740 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -6,7 +6,7 @@
 #include "ecpgerrno.h"
 #include "ecpgtype.h"
 #include "ecpglib.h"
-#include "extern.h"
+#include "ecpglib_extern.h"
 #include "sqlca.h"
 
 void

diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 42640ba9be1a614b1b8eac519d8b22a6862fc830..3f5034e7924a87daf408851be60211fa1429e87e 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -23,7 +23,7 @@
 #include "ecpgtype.h"
 #include "ecpglib.h"
 #include "ecpgerrno.h"
-#include "extern.h"
+#include "ecpglib_extern.h"
 #include "sqlca.h"
 #include "sqlda-native.h"
 #include "sqlda-compat.h"

diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c
index dc548a4cdab3c1afbcca72259218ea73d395599f..52ca1c5c687f80b03aa1dad22a2ef8d97b08160a 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/memory.c
+++ b/src/interfaces/ecpg/ecpglib/memory.c
@@ -7,7 +7,7 @@
 #include "ecpgtype.h"
 #include "ecpglib.h"
 #include "ecpgerrno.h"
-#include "extern.h"
+#include "ecpglib_extern.h"
 
 void
 ecpg_free(void *ptr)

diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index be9cac6e7b4a46e92331cf7d8bdc507acb93ef17..a26dfdb361f1ab697b470dd6afa65f2402be490f 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -9,7 +9,7 @@
 #include "ecpgtype.h"
 #include "ecpglib.h"
 #include "ecpgerrno.h"
-#include "extern.h"
+#include "ecpglib_extern.h"
 #include "sqlca.h"
 #include "pgtypes_numeric.h"
 #include "pgtypes_date.h"

diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
index 5368886f67b47b63ecfa1a8b94cd30f54ccc93e7..2dd56b02df5b71726ebbfa07291895c5c7dc153b 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/prepare.c
+++ b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -8,7 +8,7 @@
 #include "ecpgtype.h"
 #include "ecpglib.h"
 #include "ecpgerrno.h"
-#include "extern.h"
+#include "ecpglib_extern.h"
 #include "sqlca.h"
 
 #define STMTID_SIZE 32

diff --git a/src/interfaces/ecpg/ecpglib/sqlda.c b/src/interfaces/ecpg/ecpglib/sqlda.c
index 80ddc6b6b13b74f5130fea2989d724f69d1e3032..3fb0d829d37c1e76774f2903fc7d5f72b8be87c9 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/sqlda.c
+++ b/src/interfaces/ecpg/ecpglib/sqlda.c
@@ -16,7 +16,7 @@
 #include "ecpgtype.h"
 #include "ecpglib.h"
 #include "ecpgerrno.h"
-#include "extern.h"
+#include "ecpglib_extern.h"
 #include "sqlca.h"
 #include "sqlda-native.h"
 #include "sqlda-compat.h"

diff --git a/src/interfaces/ecpg/ecpglib/typename.c b/src/interfaces/ecpg/ecpglib/typename.c
index 9da1cdf4c23be947606592358725df2c4f6c3aa6..a3f281752b2a007e15e1dac024e21ca9f249cb27 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/typename.c
+++ b/src/interfaces/ecpg/ecpglib/typename.c
@@ -7,7 +7,7 @@
 
 #include "ecpgtype.h"
 #include "ecpglib.h"
-#include "extern.h"
+#include "ecpglib_extern.h"
 #include "sqltypes.h"
 #include "sql3types.h"
 

diff --git a/src/interfaces/ecpg/pgtypeslib/common.c b/src/interfaces/ecpg/pgtypeslib/common.c
index a8a7e02be035aacfe8ccb772764b4b9ffbf2b054..abcf7f5dbef8a652b61c6d32157494d71d9b201f 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/common.c
+++ b/src/interfaces/ecpg/pgtypeslib/common.c
@@ -2,7 +2,7 @@
 
 #include "postgres_fe.h"
 
-#include "extern.h"
+#include "pgtypeslib_extern.h"
 #include "pgtypes.h"
 
 /* Return value is zero-filled. */

diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index ed321febf2b2101cd4b62bd2c3608b9b32e8010d..53fcd2157fadf5c3180639947e49c369f1c1894e 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -6,7 +6,7 @@
 #include <ctype.h>
 #include <limits.h>
 
-#include "extern.h"
+#include "pgtypeslib_extern.h"
 #include "dt.h"
 #include "pgtypes_error.h"
 #include "pgtypes_date.h"

diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index ba4dd3a92407fa3887eaf08901211b04f162eb84..f5aed794fda654112e3bd291c0dbf5758a9264ea 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -6,7 +6,7 @@
 #include <ctype.h>
 #include <math.h>
 
-#include "extern.h"
+#include "pgtypeslib_extern.h"
 #include "dt.h"
 #include "pgtypes_timestamp.h"
 

diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 4fdbcd01cc705d8d61b827c7fd2198bd0258c00b..3ff8a1025a38751a29af44ee915339b280874eff 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -11,7 +11,7 @@
 
 #include "common/string.h"
 
-#include "extern.h"
+#include "pgtypeslib_extern.h"
 #include "dt.h"
 #include "pgtypes_error.h"
 #include "pgtypes_interval.h"

diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index 6643242ab196ba98f5c2ad31d3ef88f353135a49..22088bae8e44451f0f1a4b7aacb745595a379d5e 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -5,7 +5,7 @@
 #include <float.h>
 #include <limits.h>
 
-#include "extern.h"
+#include "pgtypeslib_extern.h"
 #include "pgtypes_error.h"
 
 #define Max(x, y)                              ((x) > (y) ? (x) : (y))

diff --git a/src/interfaces/ecpg/pgtypeslib/extern.h b/src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h
similarity index 87%
rename from src/interfaces/ecpg/pgtypeslib/extern.h
rename to src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h
index 9df800ea1d531eb5c363fc19510181b6d6873bf7..7e7626a3cc1eadad2bdf73092edaf25a3b7d5c10 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/extern.h
+++ b/src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h
@@ -1,7 +1,7 @@
-/* src/interfaces/ecpg/pgtypeslib/extern.h */
+/* src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h */
 
-#ifndef __PGTYPES_COMMON_H__
-#define __PGTYPES_COMMON_H__
+#ifndef _ECPG_PGTYPESLIB_EXTERN_H
+#define _ECPG_PGTYPESLIB_EXTERN_H
 
 #include "pgtypes_error.h"
 
@@ -50,4 +50,4 @@ char     *pgtypes_strdup(const char *);
 #define TRUE      1
 #endif                                                 /* TRUE */
 
-#endif                                                 /* __PGTYPES_COMMON_H__ */
+#endif                                                 /* _ECPG_PGTYPESLIB_EXTERN_H */

diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 4cd4fe2da288a1c7d29e8f609675784fa1f54844..a7e0fe66f086b0d9c79af9e55645b19134c6aff8 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -11,7 +11,7 @@
 #error -ffast-math is known to break this code
 #endif
 
-#include "extern.h"
+#include "pgtypeslib_extern.h"
 #include "dt.h"
 #include "pgtypes_timestamp.h"
 #include "pgtypes_date.h"

diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c
index 06bf0390994779ee70c02cba0ab69875874dd6d9..c367dbfc207d7d02a9737f85ddc489025c691fb3 100644 (file)
--- a/src/interfaces/ecpg/preproc/c_keywords.c
+++ b/src/interfaces/ecpg/preproc/c_keywords.c
@@ -11,7 +11,7 @@
 
 #include <ctype.h>
 
-#include "extern.h"
+#include "preproc_extern.h"
 #include "preproc.h"
 
 /*

diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c
index 729f063f62e0ed85e65d31dcbe149d645bb50963..a29f53032735ea8f7fa53e6108ce6e252822fa1a 100644 (file)
--- a/src/interfaces/ecpg/preproc/descriptor.c
+++ b/src/interfaces/ecpg/preproc/descriptor.c
@@ -9,7 +9,7 @@
 
 #include "postgres_fe.h"
 
-#include "extern.h"
+#include "preproc_extern.h"
 
 /*
  * assignment handling function (descriptor)

diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index f39bf697d64ea8001fd1ca08db1ec599c61a4562..86b3e301913d55b8bb484076a164df7324c15588 100644 (file)
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -9,7 +9,7 @@
 
 #include "getopt_long.h"
 
-#include "extern.h"
+#include "preproc_extern.h"
 
 int                    ret_value = 0;
 bool           autocommit = false,

diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header
index 8921bcbeaec8d74bedd31b96f6c05ebe2fe622dd..00143a7934a50317f7250d680b7ae7f90226a6fb 100644 (file)
--- a/src/interfaces/ecpg/preproc/ecpg.header
+++ b/src/interfaces/ecpg/preproc/ecpg.header
@@ -4,7 +4,7 @@
 %{
 #include "postgres_fe.h"
 
-#include "extern.h"
+#include "preproc_extern.h"
 #include "ecpg_config.h"
 #include <unistd.h>
 

diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 848b2d48493fea15eec3ce74358dc4901c61a93c..37c97e162d7dbf9486513fa1e303ff21f66e56f6 100644 (file)
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -13,7 +13,7 @@
 
 #include <ctype.h>
 
-#include "extern.h"
+#include "preproc_extern.h"
 #include "preproc.h"
 
 /*

diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index 21e1f928fd64ef17091abef4788e87bcd85860bf..c0ed492d414c1d7e280e365077878f86d1c222b5 100644 (file)
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -27,7 +27,7 @@
 
 #include "common/keywords.h"
 
-#include "extern.h"
+#include "preproc_extern.h"
 #include "preproc.h"
 
 

diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c
index 0465857eb6ee312472cc3a483b1b7d6d088f79ad..cdfa52608c4176c55879c89f0376c70ba95f1215 100644 (file)
--- a/src/interfaces/ecpg/preproc/output.c
+++ b/src/interfaces/ecpg/preproc/output.c
@@ -2,7 +2,7 @@
 
 #include "postgres_fe.h"
 
-#include "extern.h"
+#include "preproc_extern.h"
 
 static void output_escaped_str(char *cmd, bool quoted);
 

diff --git a/src/interfaces/ecpg/preproc/parser.c b/src/interfaces/ecpg/preproc/parser.c
index e5a8f9d170ed47adf7cc946f99df175a0ff38b8f..0e60407564eef7b8a70597e0d9e18a70619d2c7b 100644 (file)
--- a/src/interfaces/ecpg/preproc/parser.c
+++ b/src/interfaces/ecpg/preproc/parser.c
@@ -18,7 +18,7 @@
 
 #include "postgres_fe.h"
 
-#include "extern.h"
+#include "preproc_extern.h"
 #include "preproc.h"
 
 

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 5e90e35bd2bac0384b3d7abbf20bcbf60d8293d1..468ccbe2b43c4e4954e444c52f7e75e8d546b338 100644 (file)
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -22,7 +22,7 @@
 
 #include "common/string.h"
 
-#include "extern.h"
+#include "preproc_extern.h"
 #include "preproc.h"
 }
 

diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/preproc_extern.h
similarity index 98%
rename from src/interfaces/ecpg/preproc/extern.h
rename to src/interfaces/ecpg/preproc/preproc_extern.h
index aef65657da2136d237c198cc6e59ee11e93a3d1e..13eda670ffe8af9b485ca4a814d74af86fec910b 100644 (file)
--- a/src/interfaces/ecpg/preproc/extern.h
+++ b/src/interfaces/ecpg/preproc/preproc_extern.h
@@ -1,4 +1,4 @@
-/* src/interfaces/ecpg/preproc/extern.h */
+/* src/interfaces/ecpg/preproc/preproc_extern.h */
 
 #ifndef _ECPG_PREPROC_EXTERN_H
 #define _ECPG_PREPROC_EXTERN_H
@@ -7,7 +7,6 @@
 
 #include "common/keywords.h"
 
-#include <errno.h>
 #ifndef CHAR_BIT
 #include <limits.h>
 #endif

diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
index 253873dd4efd166b66c5925b7fcc98396745cd88..40ce3fb5228294453287eaa061424401c8a79126 100644 (file)
--- a/src/interfaces/ecpg/preproc/type.c
+++ b/src/interfaces/ecpg/preproc/type.c
@@ -2,7 +2,7 @@
 
 #include "postgres_fe.h"
 
-#include "extern.h"
+#include "preproc_extern.h"
 
 #define indicator_set ind_type != NULL && ind_type->type != ECPGt_NO_INDICATOR
 

diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c
index 39bf3b2474efe1fbae0b98f94282b342ec3e8806..a953498c1c9e69dc0fa8af0ae4204f34053e81cd 100644 (file)
--- a/src/interfaces/ecpg/preproc/variable.c
+++ b/src/interfaces/ecpg/preproc/variable.c
@@ -2,7 +2,7 @@
 
 #include "postgres_fe.h"
 
-#include "extern.h"
+#include "preproc_extern.h"
 
 static struct variable *allvariables = NULL;