8000 Rename ecpg's various "extern.h" files to have distinct names. · postgrespro/postgres@3295f82 · GitHub
[go: up one dir, main page]

Skip to content

Commit 3295f82

Browse files
committed
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
1 parent 2d34ad8 commit 3295f82

30 files changed

+36
-37
lines changed

src/interfaces/ecpg/ecpglib/connect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "ecpgtype.h"
88
#include "ecpglib.h"
99
#include "ecpgerrno.h"
10-
#include "extern.h"
10+
#include "ecpglib_extern.h"
1111
#include "sqlca.h"
1212

1313
#ifdef ENABLE_THREAD_SAFETY

src/interfaces/ecpg/ecpglib/data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "ecpgtype.h"
99
#include "ecpglib.h"
1010
#include "ecpgerrno.h"
11-
#include "extern.h"
11+
#include "ecpglib_extern.h"
1212
#include "sqlca.h"
1313
#include "pgtypes_numeric.h"
1414
#include "pgtypes_date.h"

src/interfaces/ecpg/ecpglib/descriptor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "ecpgtype.h"
1313
#include "ecpglib.h"
1414
#include "ecpgerrno.h"
15-
#include "extern.h"
15+
#include "ecpglib_extern.h"
1616
#include "sqlca.h"
1717
#include "sqlda.h"
1818
#include "sql3types.h"

src/interfaces/ecpg/ecpglib/extern.h renamed to src/interfaces/ecpg/ecpglib/ecpglib_extern.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/* src/interfaces/ecpg/ecpglib/extern.h */
1+
/* src/interfaces/ecpg/ecpglib/ecpglib_extern.h */
22

3-
#ifndef _ECPG_LIB_EXTERN_H
4-
#define _ECPG_LIB_EXTERN_H
3+
#ifndef _ECPG_ECPGLIB_EXTERN_H
4+
#define _ECPG_ECPGLIB_EXTERN_H
55

66
#include "libpq-fe.h"
77
#include "sqlca.h"
@@ -221,4 +221,4 @@ void ecpg_set_native_sqlda(int, struct sqlda_struct **, const PGresult *, int,
221221
#define ECPG_SQLSTATE_ECPG_INTERNAL_ERROR "YE000"
222222
#define ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY "YE001"
223223

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 numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "ecpgerrno.h"
77
#include "ecpgtype.h"
88
#include "ecpglib.h"
9-
#include "extern.h"
9+
#include "ecpglib_extern.h"
1010
#include "sqlca.h"
1111

1212
void

src/interfaces/ecpg/ecpglib/execute.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "ecpgtype.h"
2424
#include "ecpglib.h"
2525
#include "ecpgerrno.h"
26-
#include "extern.h"
26+
#include "ecpglib_extern.h"
2727
#include "sqlca.h"
2828
#include "sqlda-native.h"
2929
#include "sqlda-compat.h"

src/interfaces/ecpg/ecpglib/memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "ecpgtype.h"
88
#include "ecpglib.h"
99
#include "ecpgerrno.h"
10-
#include "extern.h"
10+
#include "ecpglib_extern.h"
1111

1212
void
1313
ecpg_free(void *ptr)

src/interfaces/ecpg/ecpglib/misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "ecpgtype.h"
1010
#include "ecpglib.h"
1111
#include "ecpgerrno.h"
12-
#include "extern.h"
12+
#include "ecpglib_extern.h"
1313
#include "sqlca.h"
1414
#include "pgtypes_numeric.h"
1515
#include "pgtypes_date.h"

src/interfaces/ecpg/ecpglib/prepare.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "ecpgtype.h"
99
#include "ecpglib.h"
1010
#include "ecpgerrno.h"
11-
#include "extern.h"
11+
#include "ecpglib_extern.h"
1212
#include "sqlca.h"
1313

1414
#define STMTID_SIZE 32

src/interfaces/ecpg/ecpglib/sqlda.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "ecpgtype.h"
1717
#include "ecpglib.h"
1818
#include "ecpgerrno.h"
19-
#include "extern.h"
19+
#include "ecpglib_extern.h"
2020
#include "sqlca.h"
2121
#include "sqlda-native.h"
2222
#include "sqlda-compat.h"

0 commit comments

Comments
 (0)
0