Movatterモバイル変換

Skip to content

postgrespro/postgres_clusterPublic

NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit3295f82

tglsfdc

committed

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

This should reduce confusion, and in particular make it safe tocopy typename.c into preproc/ and compile it there.This doesn't affect anything outside ecpg, and particularly notend users, because these files don't get installed; they justexist to share declarations among the .c files of each subdirectory.Discussion:https://postgr.es/m/31364.1543511708@sss.pgh.pa.us

1 parent2d34ad8 commit3295f82Copy full SHA for 3295f82

File tree

30 files changed

+36

-37

lines changed

src/interfaces/ecpg
- ecpglib
- pgtypeslib
- preproc

30 files changed

+36

-37

lines changed

`‎src/interfaces/ecpg/ecpglib/connect.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include"ecpgtype.h"`
`8`	`8`	`#include"ecpglib.h"`
`9`	`9`	`#include"ecpgerrno.h"`
`10`		`-#include"extern.h"`
	`10`	`+#include"ecpglib_extern.h"`
`11`	`11`	`#include"sqlca.h"`
`12`	`12`
`13`	`13`	`#ifdefENABLE_THREAD_SAFETY`

`‎src/interfaces/ecpg/ecpglib/data.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#include"ecpgtype.h"`
`9`	`9`	`#include"ecpglib.h"`
`10`	`10`	`#include"ecpgerrno.h"`
`11`		`-#include"extern.h"`
	`11`	`+#include"ecpglib_extern.h"`
`12`	`12`	`#include"sqlca.h"`
`13`	`13`	`#include"pgtypes_numeric.h"`
`14`	`14`	`#include"pgtypes_date.h"`

`‎src/interfaces/ecpg/ecpglib/descriptor.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#include"ecpgtype.h"`
`13`	`13`	`#include"ecpglib.h"`
`14`	`14`	`#include"ecpgerrno.h"`
`15`		`-#include"extern.h"`
	`15`	`+#include"ecpglib_extern.h"`
`16`	`16`	`#include"sqlca.h"`
`17`	`17`	`#include"sqlda.h"`
`18`	`18`	`#include"sql3types.h"`

`‎src/interfaces/ecpg/ecpglib/extern.hrenamed to‎src/interfaces/ecpg/ecpglib/ecpglib_extern.h`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-/* src/interfaces/ecpg/ecpglib/extern.h */`
	`1`	`+/* src/interfaces/ecpg/ecpglib/ecpglib_extern.h */`
`2`	`2`
`3`		`-#ifndef_ECPG_LIB_EXTERN_H`
`4`		`-#define_ECPG_LIB_EXTERN_H`
	`3`	`+#ifndef_ECPG_ECPGLIB_EXTERN_H`
	`4`	`+#define_ECPG_ECPGLIB_EXTERN_H`
`5`	`5`
`6`	`6`	`#include"libpq-fe.h"`
`7`	`7`	`#include"sqlca.h"`
`@@ -221,4 +221,4 @@ voidecpg_set_native_sqlda(int, struct sqlda_struct *, const PGresult , int,`
`221`	`221`	`#defineECPG_SQLSTATE_ECPG_INTERNAL_ERROR"YE000"`
`222`	`222`	`#defineECPG_SQLSTATE_ECPG_OUT_OF_MEMORY"YE001"`
`223`	`223`
`224`		`-#endif/_ECPG_LIB_EXTERN_H /`
	`224`	`+#endif/_ECPG_ECPGLIB_EXTERN_H /`

`‎src/interfaces/ecpg/ecpglib/error.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#include"ecpgerrno.h"`
`7`	`7`	`#include"ecpgtype.h"`
`8`	`8`	`#include"ecpglib.h"`
`9`		`-#include"extern.h"`
	`9`	`+#include"ecpglib_extern.h"`
`10`	`10`	`#include"sqlca.h"`
`11`	`11`
`12`	`12`	`void`

`‎src/interfaces/ecpg/ecpglib/execute.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#include"ecpgtype.h"`
`24`	`24`	`#include"ecpglib.h"`
`25`	`25`	`#include"ecpgerrno.h"`
`26`		`-#include"extern.h"`
	`26`	`+#include"ecpglib_extern.h"`
`27`	`27`	`#include"sqlca.h"`
`28`	`28`	`#include"sqlda-native.h"`
`29`	`29`	`#include"sqlda-compat.h"`

`‎src/interfaces/ecpg/ecpglib/memory.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include"ecpgtype.h"`
`8`	`8`	`#include"ecpglib.h"`
`9`	`9`	`#include"ecpgerrno.h"`
`10`		`-#include"extern.h"`
	`10`	`+#include"ecpglib_extern.h"`
`11`	`11`
`12`	`12`	`void`
`13`	`13`	`ecpg_free(void*ptr)`

`‎src/interfaces/ecpg/ecpglib/misc.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#include"ecpgtype.h"`
`10`	`10`	`#include"ecpglib.h"`
`11`	`11`	`#include"ecpgerrno.h"`
`12`		`-#include"extern.h"`
	`12`	`+#include"ecpglib_extern.h"`
`13`	`13`	`#include"sqlca.h"`
`14`	`14`	`#include"pgtypes_numeric.h"`
`15`	`15`	`#include"pgtypes_date.h"`

`‎src/interfaces/ecpg/ecpglib/prepare.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#include"ecpgtype.h"`
`9`	`9`	`#include"ecpglib.h"`
`10`	`10`	`#include"ecpgerrno.h"`
`11`		`-#include"extern.h"`
	`11`	`+#include"ecpglib_extern.h"`
`12`	`12`	`#include"sqlca.h"`
`13`	`13`
`14`	`14`	`#defineSTMTID_SIZE 32`

`‎src/interfaces/ecpg/ecpglib/sqlda.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`#include"ecpgtype.h"`
`17`	`17`	`#include"ecpglib.h"`
`18`	`18`	`#include"ecpgerrno.h"`
`19`		`-#include"extern.h"`
	`19`	`+#include"ecpglib_extern.h"`
`20`	`20`	`#include"sqlca.h"`
`21`	`21`	`#include"sqlda-native.h"`
`22`	`22`	`#include"sqlda-compat.h"`

`‎src/interfaces/ecpg/ecpglib/typename.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`#include"ecpgtype.h"`
`9`	`9`	`#include"ecpglib.h"`
`10`		`-#include"extern.h"`
	`10`	`+#include"ecpglib_extern.h"`
`11`	`11`	`#include"sqltypes.h"`
`12`	`12`	`#include"sql3types.h"`
`13`	`13`

`‎src/interfaces/ecpg/pgtypeslib/common.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#include"postgres_fe.h"`
`4`	`4`
`5`		`-#include"extern.h"`
	`5`	`+#include"pgtypeslib_extern.h"`
`6`	`6`	`#include"pgtypes.h"`
`7`	`7`
`8`	`8`	`/* Return value is zero-filled. */`

`‎src/interfaces/ecpg/pgtypeslib/datetime.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#include<ctype.h>`
`7`	`7`	`#include<limits.h>`
`8`	`8`
`9`		`-#include"extern.h"`
	`9`	`+#include"pgtypeslib_extern.h"`
`10`	`10`	`#include"dt.h"`
`11`	`11`	`#include"pgtypes_error.h"`
`12`	`12`	`#include"pgtypes_date.h"`

`‎src/interfaces/ecpg/pgtypeslib/dt_common.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#include<ctype.h>`
`7`	`7`	`#include<math.h>`
`8`	`8`
`9`		`-#include"extern.h"`
	`9`	`+#include"pgtypeslib_extern.h"`
`10`	`10`	`#include"dt.h"`
`11`	`11`	`#include"pgtypes_timestamp.h"`
`12`	`12`

`‎src/interfaces/ecpg/pgtypeslib/interval.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`#include"common/string.h"`
`13`	`13`
`14`		`-#include"extern.h"`
	`14`	`+#include"pgtypeslib_extern.h"`
`15`	`15`	`#include"dt.h"`
`16`	`16`	`#include"pgtypes_error.h"`
`17`	`17`	`#include"pgtypes_interval.h"`

`‎src/interfaces/ecpg/pgtypeslib/numeric.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include<float.h>`
`6`	`6`	`#include<limits.h>`
`7`	`7`
`8`		`-#include"extern.h"`
	`8`	`+#include"pgtypeslib_extern.h"`
`9`	`9`	`#include"pgtypes_error.h"`
`10`	`10`
`11`	`11`	`#defineMax(x,y)((x) > (y) ? (x) : (y))`

`‎src/interfaces/ecpg/pgtypeslib/extern.hrenamed to‎src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-/* src/interfaces/ecpg/pgtypeslib/extern.h */`
	`1`	`+/* src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h */`
`2`	`2`
`3`		`-#ifndef__PGTYPES_COMMON_H__`
`4`		`-#define__PGTYPES_COMMON_H__`
	`3`	`+#ifndef_ECPG_PGTYPESLIB_EXTERN_H`
	`4`	`+#define_ECPG_PGTYPESLIB_EXTERN_H`
`5`	`5`
`6`	`6`	`#include"pgtypes_error.h"`
`7`	`7`
`@@ -50,4 +50,4 @@ char pgtypes_strdup(const char );`
`50`	`50`	`#defineTRUE 1`
`51`	`51`	`#endif/* TRUE */`
`52`	`52`
`53`		`-#endif/__PGTYPES_COMMON_H__ /`
	`53`	`+#endif/_ECPG_PGTYPESLIB_EXTERN_H /`

`‎src/interfaces/ecpg/pgtypeslib/timestamp.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#error -ffast-math is known to break this code`
`12`	`12`	`#endif`
`13`	`13`
`14`		`-#include"extern.h"`
	`14`	`+#include"pgtypeslib_extern.h"`
`15`	`15`	`#include"dt.h"`
`16`	`16`	`#include"pgtypes_timestamp.h"`
`17`	`17`	`#include"pgtypes_date.h"`

`‎src/interfaces/ecpg/preproc/c_keywords.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`#include<ctype.h>`
`13`	`13`
`14`		`-#include"extern.h"`
	`14`	`+#include"preproc_extern.h"`
`15`	`15`	`#include"preproc.h"`
`16`	`16`
`17`	`17`	`/*`

`‎src/interfaces/ecpg/preproc/descriptor.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`#include"postgres_fe.h"`
`11`	`11`
`12`		`-#include"extern.h"`
	`12`	`+#include"preproc_extern.h"`
`13`	`13`
`14`	`14`	`/*`
`15`	`15`	`* assignment handling function (descriptor)`

`‎src/interfaces/ecpg/preproc/ecpg.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`#include"getopt_long.h"`
`11`	`11`
`12`		`-#include"extern.h"`
	`12`	`+#include"preproc_extern.h"`
`13`	`13`
`14`	`14`	`intret_value=0;`
`15`	`15`	`boolautocommit= false,`

`‎src/interfaces/ecpg/preproc/ecpg.header`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`%{`
`5`	`5`	`#include "postgres_fe.h"`
`6`	`6`
`7`		`-#include "extern.h"`
	`7`	`+#include "preproc_extern.h"`
`8`	`8`	`#include "ecpg_config.h"`
`9`	`9`	`#include <unistd.h>`
`10`	`10`

`‎src/interfaces/ecpg/preproc/ecpg_keywords.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`#include<ctype.h>`
`15`	`15`
`16`		`-#include"extern.h"`
	`16`	`+#include"preproc_extern.h"`
`17`	`17`	`#include"preproc.h"`
`18`	`18`
`19`	`19`	`/*`

`‎src/interfaces/ecpg/preproc/keywords.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`#include"common/keywords.h"`
`29`	`29`
`30`		`-#include"extern.h"`
	`30`	`+#include"preproc_extern.h"`
`31`	`31`	`#include"preproc.h"`
`32`	`32`
`33`	`33`

`‎src/interfaces/ecpg/preproc/output.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#include"postgres_fe.h"`
`4`	`4`
`5`		`-#include"extern.h"`
	`5`	`+#include"preproc_extern.h"`
`6`	`6`
`7`	`7`	`staticvoidoutput_escaped_str(char*cmd,boolquoted);`
`8`	`8`

`‎src/interfaces/ecpg/preproc/parser.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`#include"postgres_fe.h"`
`20`	`20`
`21`		`-#include"extern.h"`
	`21`	`+#include"preproc_extern.h"`
`22`	`22`	`#include"preproc.h"`
`23`	`23`
`24`	`24`

`‎src/interfaces/ecpg/preproc/pgc.l`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`#include "common/string.h"`
`24`	`24`
`25`		`-#include "extern.h"`
	`25`	`+#include "preproc_extern.h"`
`26`	`26`	`#include "preproc.h"`
`27`	`27`	`}`
`28`	`28`

`‎src/interfaces/ecpg/preproc/extern.hrenamed to‎src/interfaces/ecpg/preproc/preproc_extern.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* src/interfaces/ecpg/preproc/extern.h */`
	`1`	`+/* src/interfaces/ecpg/preproc/preproc_extern.h */`
`2`	`2`
`3`	`3`	`#ifndef_ECPG_PREPROC_EXTERN_H`
`4`	`4`	`#define_ECPG_PREPROC_EXTERN_H`
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`#include"common/keywords.h"`
`9`	`9`
`10`		`-#include<errno.h>`
`11`	`10`	`#ifndefCHAR_BIT`
`12`	`11`	`#include<limits.h>`
`13`	`12`	`#endif`

`‎src/interfaces/ecpg/preproc/type.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#include"postgres_fe.h"`
`4`	`4`
`5`		`-#include"extern.h"`
	`5`	`+#include"preproc_extern.h"`
`6`	`6`
`7`	`7`	`#defineindicator_set ind_type != NULL && ind_type->type != ECPGt_NO_INDICATOR`
`8`	`8`

`‎src/interfaces/ecpg/preproc/variable.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#include"postgres_fe.h"`
`4`	`4`
`5`		`-#include"extern.h"`
	`5`	`+#include"preproc_extern.h"`
`6`	`6`
`7`	`7`	`staticstructvariable*allvariables=NULL;`
`8`	`8`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp