Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit906b2e1

Browse files
committed
Rename DLLIMPORT macro to PGDLLIMPORT to avoid conflict with
third party includes (like tcl) that define DLLIMPORT.
1 parent5cbb119 commit906b2e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+163
-163
lines changed

‎src/backend/utils/mmgr/mcxt.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
*
1616
* IDENTIFICATION
17-
* $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.60 2007/03/13 00:33:42 tgl Exp $
17+
* $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.61 2007/07/25 12:22:52 mha Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
@@ -662,8 +662,8 @@ MemoryContextStrdup(MemoryContext context, const char *string)
662662
/*
663663
*Memory support routines for libpgport on Win32
664664
*
665-
*Win32 can't load a library thatDLLIMPORTs a variable
666-
*if the link object files alsoDLLIMPORT the same variable.
665+
*Win32 can't load a library thatPGDLLIMPORTs a variable
666+
*if the link object files alsoPGDLLIMPORT the same variable.
667667
*For this reason, libpgport can't reference CurrentMemoryContext
668668
*in the palloc macro calls.
669669
*
@@ -684,7 +684,7 @@ pgport_pstrdup(const char *str)
684684
}
685685

686686

687-
/* Doesn't reference aDLLIMPORT variable, but here for completeness. */
687+
/* Doesn't reference aPGDLLIMPORT variable, but here for completeness. */
688688
void
689689
pgport_pfree(void*pointer)
690690
{

‎src/include/access/gin.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* header file for postgres inverted index access method implementation.
44
*
55
*Copyright (c) 2006, PostgreSQL Global Development Group
6-
*$PostgreSQL: pgsql/src/include/access/gin.h,v 1.11 2007/04/0922:04:04 tgl Exp $
6+
*$PostgreSQL: pgsql/src/include/access/gin.h,v 1.12 2007/07/25 12:22:53 mha Exp $
77
*--------------------------------------------------------------------------
88
*/
99

@@ -414,7 +414,7 @@ extern Datum ginrestrpos(PG_FUNCTION_ARGS);
414414
externvoidnewScanKey(IndexScanDescscan);
415415

416416
/* ginget.c */
417-
externDLLIMPORTintGinFuzzySearchLimit;
417+
externPGDLLIMPORTintGinFuzzySearchLimit;
418418

419419
#defineItemPointerSetMax(p)ItemPointerSet( (p), (BlockNumber)0xffffffff, (OffsetNumber)0xffff )
420420
#defineItemPointerIsMax(p) ( ItemPointerGetBlockNumber(p) == (BlockNumber)0xffffffff && ItemPointerGetOffsetNumber(p) == (OffsetNumber)0xffff )

‎src/include/c.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
1313
* Portions Copyright (c) 1994, Regents of the University of California
1414
*
15-
* $PostgreSQL: pgsql/src/include/c.h,v 1.219 2007/02/27 23:48:09 tgl Exp $
15+
* $PostgreSQL: pgsql/src/include/c.h,v 1.220 2007/07/25 12:22:52 mha Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -784,8 +784,8 @@ extern intvsnprintf(char *str, size_t count, const char *fmt, va_list args);
784784
#definememmove(d,s,c)bcopy(s, d, c)
785785
#endif
786786

787-
#ifndefDLLIMPORT
788-
#defineDLLIMPORT/* no special DLL markers on most ports */
787+
#ifndefPGDLLIMPORT
788+
#definePGDLLIMPORT/* no special DLL markers on most ports */
789789
#endif
790790

791791
/*

‎src/include/commands/explain.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994-5, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.31 2007/05/2517:54:25 tgl Exp $
9+
* $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.32 2007/07/2512:22:53 mha Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -21,11 +21,11 @@ typedef void (*ExplainOneQuery_hook_type) (Query *query,
2121
constchar*queryString,
2222
ParamListInfoparams,
2323
TupOutputState*tstate);
24-
externDLLIMPORTExplainOneQuery_hook_typeExplainOneQuery_hook;
24+
externPGDLLIMPORTExplainOneQuery_hook_typeExplainOneQuery_hook;
2525

2626
/* Hook for plugins to get control in explain_get_index_name() */
2727
typedefconstchar* (*explain_get_index_name_hook_type) (OidindexId);
28-
externDLLIMPORTexplain_get_index_name_hook_typeexplain_get_index_name_hook;
28+
externPGDLLIMPORTexplain_get_index_name_hook_typeexplain_get_index_name_hook;
2929

3030

3131
externvoidExplainQuery(ExplainStmt*stmt,constchar*queryString,

‎src/include/commands/vacuum.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.72 2007/05/30 20:12:03 tgl Exp $
10+
* $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.73 2007/07/2512:22:53 mha Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -107,7 +107,7 @@ typedef struct VacAttrStats
107107

108108

109109
/* GUC parameters */
110-
externDLLIMPORTintdefault_statistics_target;/*DLLIMPORT for PostGIS */
110+
externPGDLLIMPORTintdefault_statistics_target;/*PGDLLIMPORT for PostGIS */
111111
externintvacuum_freeze_min_age;
112112

113113

‎src/include/executor/spi.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.61 2007/04/16 01:14:57 tgl Exp $
9+
* $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.62 2007/07/25 12:22:53 mha Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -84,10 +84,10 @@ typedef struct _SPI_plan *SPIPlanPtr;
8484
#defineSPI_OK_DELETE_RETURNING 12
8585
#defineSPI_OK_UPDATE_RETURNING 13
8686

87-
externDLLIMPORTuint32SPI_processed;
88-
externDLLIMPORTOidSPI_lastoid;
89-
externDLLIMPORTSPITupleTable*SPI_tuptable;
90-
externDLLIMPORTintSPI_result;
87+
externPGDLLIMPORTuint32SPI_processed;
88+
externPGDLLIMPORTOidSPI_lastoid;
89+
externPGDLLIMPORTSPITupleTable*SPI_tuptable;
90+
externPGDLLIMPORTintSPI_result;
9191

9292
externintSPI_connect(void);
9393
externintSPI_finish(void);

‎src/include/fmgr.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
1212
* Portions Copyright (c) 1994, Regents of the University of California
1313
*
14-
* $PostgreSQL: pgsql/src/include/fmgr.h,v 1.51 2007/05/15 17:39:54 momjian Exp $
14+
* $PostgreSQL: pgsql/src/include/fmgr.h,v 1.52 2007/07/25 12:22:52 mha Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -322,10 +322,10 @@ typedef const Pg_finfo_record *(*PGFInfoFunction) (void);
322322
/*
323323
*Macro to build an info function associated with the given function name.
324324
*Win32 loadable functions usually link with 'dlltool --export-all', but it
325-
*doesn't hurt to addDLLIMPORT in case they don't.
325+
*doesn't hurt to addPGDLLIMPORT in case they don't.
326326
*/
327327
#definePG_FUNCTION_INFO_V1(funcname) \
328-
externDLLIMPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \
328+
externPGDLLIMPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \
329329
const Pg_finfo_record * \
330330
CppConcat(pg_finfo_,funcname) (void) \
331331
{ \
@@ -384,7 +384,7 @@ typedef const Pg_magic_struct *(*PGModuleMagicFunction) (void);
384384
#definePG_MAGIC_FUNCTION_NAME_STRING "Pg_magic_func"
385385

386386
#definePG_MODULE_MAGIC \
387-
externDLLIMPORT const Pg_magic_struct *PG_MAGIC_FUNCTION_NAME(void); \
387+
externPGDLLIMPORT const Pg_magic_struct *PG_MAGIC_FUNCTION_NAME(void); \
388388
const Pg_magic_struct * \
389389
PG_MAGIC_FUNCTION_NAME(void) \
390390
{ \

‎src/include/miscadmin.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
1414
* Portions Copyright (c) 1994, Regents of the University of California
1515
*
16-
* $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.194 2007/04/16 18:29:56 alvherre Exp $
16+
* $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.195 2007/07/25 12:22:53 mha Exp $
1717
*
1818
* NOTES
1919
* some of the information in this file should be moved to other files.
@@ -64,14 +64,14 @@
6464

6565
/* in globals.c */
6666
/* these are marked volatile because they are set by signal handlers: */
67-
externDLLIMPORTvolatileboolInterruptPending;
67+
externPGDLLIMPORTvolatileboolInterruptPending;
6868
externvolatileboolQueryCancelPending;
6969
externvolatileboolProcDiePending;
7070

7171
/* these are marked volatile because they are examined by signal handlers: */
7272
externvolatileboolImmediateInterruptOK;
73-
externDLLIMPORTvolatileuint32InterruptHoldoffCount;
74-
externDLLIMPORTvolatileuint32CritSectionCount;
73+
externPGDLLIMPORTvolatileuint32InterruptHoldoffCount;
74+
externPGDLLIMPORTvolatileuint32CritSectionCount;
7575

7676
/* in tcop/postgres.c */
7777
externvoidProcessInterrupts(void);
@@ -125,18 +125,18 @@ extern bool IsUnderPostmaster;
125125

126126
externboolExitOnAnyError;
127127

128-
externDLLIMPORTchar*DataDir;
128+
externPGDLLIMPORTchar*DataDir;
129129

130-
externDLLIMPORTintNBuffers;
130+
externPGDLLIMPORTintNBuffers;
131131
externintMaxBackends;
132132
externintMaxConnections;
133133

134-
externDLLIMPORTintMyProcPid;
135-
externDLLIMPORTstructPort*MyProcPort;
134+
externPGDLLIMPORTintMyProcPid;
135+
externPGDLLIMPORTstructPort*MyProcPort;
136136
externlongMyCancelKey;
137137

138138
externcharOutputFileName[];
139-
externDLLIMPORTcharmy_exec_path[];
139+
externPGDLLIMPORTcharmy_exec_path[];
140140
externcharpkglib_path[];
141141

142142
#ifdefEXEC_BACKEND
@@ -148,9 +148,9 @@ extern char postgres_exec_path[];
148148
*
149149
* extern BackendId MyBackendId;
150150
*/
151-
externDLLIMPORTOidMyDatabaseId;
151+
externPGDLLIMPORTOidMyDatabaseId;
152152

153-
externDLLIMPORTOidMyDatabaseTableSpace;
153+
externPGDLLIMPORTOidMyDatabaseTableSpace;
154154

155155
/*
156156
* Date/Time Configuration
@@ -202,8 +202,8 @@ extern intCTimeZone;
202202

203203
externboolenableFsync;
204204
externboolallowSystemTableMods;
205-
externDLLIMPORTintwork_mem;
206-
externDLLIMPORTintmaintenance_work_mem;
205+
externPGDLLIMPORTintwork_mem;
206+
externPGDLLIMPORTintmaintenance_work_mem;
207207

208208
externintVacuumCostPageHit;
209209
externintVacuumCostPageMiss;

‎src/include/nodes/nodes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.201 2007/06/11 01:16:30 tgl Exp $
10+
* $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.202 2007/07/25 12:22:53 mha Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -386,7 +386,7 @@ typedef struct Node
386386
*Fortunately, this macro isn't recursive so we just define
387387
*a global variable for this purpose.
388388
*/
389-
externDLLIMPORTNode*newNodeMacroHolder;
389+
externPGDLLIMPORTNode*newNodeMacroHolder;
390390

391391
#definenewNode(size,tag) \
392392
( \

‎src/include/optimizer/cost.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.87 2007/05/21 17:57:34 tgl Exp $
10+
* $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.88 2007/07/25 12:22:53 mha Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -36,12 +36,12 @@
3636
*/
3737

3838
/* parameter variables and flags */
39-
externDLLIMPORTdoubleseq_page_cost;
40-
externDLLIMPORTdoublerandom_page_cost;
41-
externDLLIMPORTdoublecpu_tuple_cost;
42-
externDLLIMPORTdoublecpu_index_tuple_cost;
43-
externDLLIMPORTdoublecpu_operator_cost;
44-
externDLLIMPORTinteffective_cache_size;
39+
externPGDLLIMPORTdoubleseq_page_cost;
40+
externPGDLLIMPORTdoublerandom_page_cost;
41+
externPGDLLIMPORTdoublecpu_tuple_cost;
42+
externPGDLLIMPORTdoublecpu_index_tuple_cost;
43+
externPGDLLIMPORTdoublecpu_operator_cost;
44+
externPGDLLIMPORTinteffective_cache_size;
4545
externCostdisable_cost;
4646
externboolenable_seqscan;
4747
externboolenable_indexscan;

‎src/include/optimizer/plancat.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.44 2007/05/2517:54:25 tgl Exp $
10+
* $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.45 2007/07/2512:22:53 mha Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -21,7 +21,7 @@ typedef void (*get_relation_info_hook_type) (PlannerInfo *root,
2121
OidrelationObjectId,
2222
boolinhparent,
2323
RelOptInfo*rel);
24-
externDLLIMPORTget_relation_info_hook_typeget_relation_info_hook;
24+
externPGDLLIMPORTget_relation_info_hook_typeget_relation_info_hook;
2525

2626

2727
externvoidget_relation_info(PlannerInfo*root,OidrelationObjectId,

‎src/include/optimizer/planner.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.40 2007/05/2517:54:25 tgl Exp $
10+
* $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.41 2007/07/2512:22:53 mha Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -22,7 +22,7 @@
2222
typedefPlannedStmt* (*planner_hook_type) (Query*parse,
2323
intcursorOptions,
2424
ParamListInfoboundParams);
25-
externDLLIMPORTplanner_hook_typeplanner_hook;
25+
externPGDLLIMPORTplanner_hook_typeplanner_hook;
2626

2727

2828
externPlannedStmt*planner(Query*parse,intcursorOptions,

‎src/include/port/cygwin.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.6 2003/12/23 03:31:30 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.7 2007/07/25 12:22:53 mha Exp $ */
22

33
#include<cygwin/version.h>
44

@@ -14,8 +14,8 @@
1414
#endif
1515

1616
#ifdefBUILDING_DLL
17-
#defineDLLIMPORT __declspec (dllexport)
17+
#definePGDLLIMPORT __declspec (dllexport)
1818
#else
19-
#defineDLLIMPORT __declspec (dllimport)
19+
#definePGDLLIMPORT __declspec (dllimport)
2020

2121
#endif

‎src/include/port/win32.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.75 2007/07/24 09:00:27 mha Exp $ */
1+
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.76 2007/07/25 12:22:53 mha Exp $ */
22

33
#if defined(_MSC_VER)|| defined(__BORLANDC__)
44
#defineWIN32_ONLY_COMPILER
@@ -51,13 +51,13 @@
5151
#endif
5252

5353
#ifdefBUILDING_DLL
54-
#defineDLLIMPORT __declspec (dllexport)
54+
#definePGDLLIMPORT __declspec (dllexport)
5555
#else/* not BUILDING_DLL */
56-
#defineDLLIMPORT __declspec (dllimport)
56+
#definePGDLLIMPORT __declspec (dllimport)
5757
#endif
5858
#else/* not CYGWIN, not MSVC, not MingW */
5959

60-
#defineDLLIMPORT
60+
#definePGDLLIMPORT
6161
#endif
6262

6363

@@ -230,8 +230,8 @@ typedef int pid_t;
230230

231231

232232
/* In backend/port/win32/signal.c */
233-
externDLLIMPORTvolatileintpg_signal_queue;
234-
externDLLIMPORTintpg_signal_mask;
233+
externPGDLLIMPORTvolatileintpg_signal_queue;
234+
externPGDLLIMPORTintpg_signal_mask;
235235
externHANDLEpgwin32_signal_event;
236236
externHANDLEpgwin32_initial_signal_pipe;
237237

‎src/include/postgres.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
1111
* Portions Copyright (c) 1995, Regents of the University of California
1212
*
13-
* $PostgreSQL: pgsql/src/include/postgres.h,v 1.81 2007/05/15 17:39:54 momjian Exp $
13+
* $PostgreSQL: pgsql/src/include/postgres.h,v 1.82 2007/07/25 12:22:53 mha Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -650,7 +650,7 @@ extern Datum Float8GetDatum(float8 X);
650650
* ----------------------------------------------------------------
651651
*/
652652

653-
externDLLIMPORTboolassert_enabled;
653+
externPGDLLIMPORTboolassert_enabled;
654654

655655
/*
656656
* USE_ASSERT_CHECKING, if defined, turns on all the assertions.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp