Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
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"

src/interfaces/ecpg/ecpglib/typename.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "ecpgtype.h"
99
#include "ecpglib.h"
10-
#include "extern.h"
10+
#include "ecpglib_extern.h"
1111
#include "sqltypes.h"
1212
#include "sql3types.h"
1313

src/interfaces/ecpg/pgtypeslib/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "postgres_fe.h"
44

5-
#include "extern.h"
5+
#include "pgtypeslib_extern.h"
66
#include "pgtypes.h"
77

88
/* Return value is zero-filled. */

src/interfaces/ecpg/pgtypeslib/datetime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <ctype.h>
77
#include <limits.h>
88

9-
#include "extern.h"
9+
#include "pgtypeslib_extern.h"
1010
#include "dt.h"
1111
#include "pgtypes_error.h"
1212
#include "pgtypes_date.h"

src/interfaces/ecpg/pgtypeslib/dt_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <ctype.h>
77
#include <math.h>
88

9-
#include "extern.h"
9+
#include "pgtypeslib_extern.h"
1010
#include "dt.h"
1111
#include "pgtypes_timestamp.h"
1212

src/interfaces/ecpg/pgtypeslib/interval.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "common/string.h"
1313

14-
#include "extern.h"
14+
#include "pgtypeslib_extern.h"
1515
#include "dt.h"
1616
#include "pgtypes_error.h"
1717
#include "pgtypes_interval.h"

src/interfaces/ecpg/pgtypeslib/numeric.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <float.h>
66
#include <limits.h>
77

8-
#include "extern.h"
8+
#include "pgtypeslib_extern.h"
99
#include "pgtypes_error.h"
1010

1111
#define Max(x, y) ((x) > (y) ? (x) : (y))

src/interfaces/ecpg/pgtypeslib/extern.h renamed to src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h

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

3-
#ifndef __PGTYPES_COMMON_H__
4-
#define __PGTYPES_COMMON_H__
3+
#ifndef _ECPG_PGTYPESLIB_EXTERN_H
4+
#define _ECPG_PGTYPESLIB_EXTERN_H
55

66
#include "pgtypes_error.h"
77

@@ -50,4 +50,4 @@ char *pgtypes_strdup(const char *);
5050
#define TRUE 1
5151
#endif /* TRUE */
5252

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 numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#error -ffast-math is known to break this code
1212
#endif
1313

14-
#include "extern.h"
14+
#include "pgtypeslib_extern.h"
1515
#include "dt.h"
1616
#include "pgtypes_timestamp.h"
1717
#include "pgtypes_date.h"

src/interfaces/ecpg/preproc/c_keywords.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <ctype.h>
1313

14-
#include "extern.h"
14+
#include "preproc_extern.h"
1515
#include "preproc.h"
1616

1717
/*

src/interfaces/ecpg/preproc/descriptor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "postgres_fe.h"
1111

12-
#include "extern.h"
12+
#include "preproc_extern.h"
1313

1414
/*
1515
* assignment handling function (descriptor)

src/interfaces/ecpg/preproc/ecpg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "getopt_long.h"
1111

12-
#include "extern.h"
12+
#include "preproc_extern.h"
1313

1414
int ret_value = 0;
1515
bool autocommit = false,

src/interfaces/ecpg/preproc/ecpg.header

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%{
55
#include "postgres_fe.h"
66

7-
#include "extern.h"
7+
#include "preproc_extern.h"
88
#include "ecpg_config.h"
99
#include <unistd.h>
1010

src/interfaces/ecpg/preproc/ecpg_keywords.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <ctype.h>
1515

16-
#include "extern.h"
16+
#include "preproc_extern.h"
1717
#include "preproc.h"
1818

1919
/*

src/interfaces/ecpg/preproc/keywords.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "common/keywords.h"
2929

30-
#include "extern.h"
30+
#include "preproc_extern.h"
3131
#include "preproc.h"
3232

3333

src/interfaces/ecpg/preproc/output.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "postgres_fe.h"
44

5-
#include "extern.h"
5+
#include "preproc_extern.h"
66

77
static void output_escaped_str(char *cmd, bool quoted);
88

src/interfaces/ecpg/preproc/parser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "postgres_fe.h"
2020

21-
#include "extern.h"
21+
#include "preproc_extern.h"
2222
#include "preproc.h"
2323

2424

src/interfaces/ecpg/preproc/pgc.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "common/string.h"
2424

25-
#include "extern.h"
25+
#include "preproc_extern.h"
2626
#include "preproc.h"
2727
}
2828

src/interfaces/ecpg/preproc/extern.h renamed to src/interfaces/ecpg/preproc/preproc_extern.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* src/interfaces/ecpg/preproc/extern.h */
1+
/* src/interfaces/ecpg/preproc/preproc_extern.h */
22

33
#ifndef _ECPG_PREPROC_EXTERN_H
44
#define _ECPG_PREPROC_EXTERN_H
@@ -7,7 +7,6 @@
77

88
#include "common/keywords.h"
99

10-
#include <errno.h>
1110
#ifndef CHAR_BIT
1211
#include <limits.h>
1312
#endif

src/interfaces/ecpg/preproc/type.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "postgres_fe.h"
44

5-
#include "extern.h"
5+
#include "preproc_extern.h"
66

77
#define indicator_set ind_type != NULL && ind_type->type != ECPGt_NO_INDICATOR
88

src/interfaces/ecpg/preproc/variable.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "postgres_fe.h"
44

5-
#include "extern.h"
5+
#include "preproc_extern.h"
66

77
static struct variable *allvariables = NULL;
88

0 commit comments

Comments
 (0)