Rename DLLIMPORT macro to PGDLLIMPORT to avoid conflict with

third party includes (like tcl) that define DLLIMPORT.

diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 536d450dc4c4292535e6d35212c2dd411a6b8002..d392376970f3f594f57b188104efe306b2899cf2 100644 (file)
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -662,8 +662,8 @@ MemoryContextStrdup(MemoryContext context, const char *string)
 /*
  *     Memory support routines for libpgport on Win32
  *
- *     Win32 can't load a library that DLLIMPORTs a variable
- *     if the link object files also DLLIMPORT the same variable.
+ *     Win32 can't load a library that PGDLLIMPORTs a variable
+ *     if the link object files also PGDLLIMPORT the same variable.
  *     For this reason, libpgport can't reference CurrentMemoryContext
  *     in the palloc macro calls.
  *
@@ -684,7 +684,7 @@ pgport_pstrdup(const char *str)
 }
 
 
-/* Doesn't reference a DLLIMPORT variable, but here for completeness. */
+/* Doesn't reference a PGDLLIMPORT variable, but here for completeness. */
 void
 pgport_pfree(void *pointer)
 {

diff --git a/src/include/access/gin.h b/src/include/access/gin.h
index b1ff1cf57c9f15b866480c969113bdefcf9296b6..9ffc7488f9f2de7b5214b12893ce909b73c889b2 100644 (file)
--- a/src/include/access/gin.h
+++ b/src/include/access/gin.h
@@ -414,7 +414,7 @@ extern Datum ginrestrpos(PG_FUNCTION_ARGS);
 extern void newScanKey(IndexScanDesc scan);
 
 /* ginget.c */
-extern DLLIMPORT int GinFuzzySearchLimit;
+extern PGDLLIMPORT int GinFuzzySearchLimit;
 
 #define ItemPointerSetMax(p)   ItemPointerSet( (p), (BlockNumber)0xffffffff, (OffsetNumber)0xffff )
 #define ItemPointerIsMax(p) ( ItemPointerGetBlockNumber(p) == (BlockNumber)0xffffffff && ItemPointerGetOffsetNumber(p) == (OffsetNumber)0xffff )

diff --git a/src/include/c.h b/src/include/c.h
index b6733b59e1629b6a3ed5d223a7e715fd151b8f01..92b8e245ba5a51a2e94672543a229c9b3466e9b0 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -784,8 +784,8 @@ extern int  vsnprintf(char *str, size_t count, const char *fmt, va_list args);
 #define memmove(d, s, c)               bcopy(s, d, c)
 #endif
 
-#ifndef DLLIMPORT
-#define DLLIMPORT                              /* no special DLL markers on most ports */
+#ifndef PGDLLIMPORT
+#define PGDLLIMPORT                            /* no special DLL markers on most ports */
 #endif
 
 /*

diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index 5565380e9b6db71f4f077599277f36e81026a467..0077d7417321e1d0b8bbb363eb8f81195d558d04 100644 (file)
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -21,11 +21,11 @@ typedef void (*ExplainOneQuery_hook_type) (Query *query,
                                                                                   const char *queryString,
                                                                                   ParamListInfo params,
                                                                                   TupOutputState *tstate);
-extern DLLIMPORT ExplainOneQuery_hook_type ExplainOneQuery_hook;
+extern PGDLLIMPORT ExplainOneQuery_hook_type ExplainOneQuery_hook;
 
 /* Hook for plugins to get control in explain_get_index_name() */
 typedef const char * (*explain_get_index_name_hook_type) (Oid indexId);
-extern DLLIMPORT explain_get_index_name_hook_type explain_get_index_name_hook;
+extern PGDLLIMPORT explain_get_index_name_hook_type explain_get_index_name_hook;
 
 
 extern void ExplainQuery(ExplainStmt *stmt, const char *queryString,

diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index 43ca8f82e3abe2520d9028884c8ba4c7d706a496..6c3a0bb1a61ec46376da34d0441ebf3ac1495a2a 100644 (file)
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -107,7 +107,7 @@ typedef struct VacAttrStats
 
 
 /* GUC parameters */
-extern DLLIMPORT int default_statistics_target; /* DLLIMPORT for PostGIS */
+extern PGDLLIMPORT int default_statistics_target; /* PGDLLIMPORT for PostGIS */
 extern int     vacuum_freeze_min_age;
 
 

diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index a38c66a25692d54e7a6aae79ffa647c2713077a4..4c0095de725a664a0c637d632a0d1bdac34197d7 100644 (file)
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -84,10 +84,10 @@ typedef struct _SPI_plan *SPIPlanPtr;
 #define SPI_OK_DELETE_RETURNING 12
 #define SPI_OK_UPDATE_RETURNING 13
 
-extern DLLIMPORT uint32 SPI_processed;
-extern DLLIMPORT Oid SPI_lastoid;
-extern DLLIMPORT SPITupleTable *SPI_tuptable;
-extern DLLIMPORT int SPI_result;
+extern PGDLLIMPORT uint32 SPI_processed;
+extern PGDLLIMPORT Oid SPI_lastoid;
+extern PGDLLIMPORT SPITupleTable *SPI_tuptable;
+extern PGDLLIMPORT int SPI_result;
 
 extern int     SPI_connect(void);
 extern int     SPI_finish(void);

diff --git a/src/include/fmgr.h b/src/include/fmgr.h
index be074acaf3da881c63896f905c3e9efa56f4e908..1328277284ed386925e7805350b9ae04e8536f7e 100644 (file)
--- a/src/include/fmgr.h
+++ b/src/include/fmgr.h
@@ -322,10 +322,10 @@ typedef const Pg_finfo_record *(*PGFInfoFunction) (void);
 /*
  *     Macro to build an info function associated with the given function name.
  *     Win32 loadable functions usually link with 'dlltool --export-all', but it
- *     doesn't hurt to add DLLIMPORT in case they don't.
+ *     doesn't hurt to add PGDLLIMPORT in case they don't.
  */
 #define PG_FUNCTION_INFO_V1(funcname) \
-extern DLLIMPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \
+extern PGDLLIMPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \
 const Pg_finfo_record * \
 CppConcat(pg_finfo_,funcname) (void) \
 { \
@@ -384,7 +384,7 @@ typedef const Pg_magic_struct *(*PGModuleMagicFunction) (void);
 #define PG_MAGIC_FUNCTION_NAME_STRING "Pg_magic_func"
 
 #define PG_MODULE_MAGIC \
-extern DLLIMPORT const Pg_magic_struct *PG_MAGIC_FUNCTION_NAME(void); \
+extern PGDLLIMPORT const Pg_magic_struct *PG_MAGIC_FUNCTION_NAME(void); \
 const Pg_magic_struct * \
 PG_MAGIC_FUNCTION_NAME(void) \
 { \

diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 574d081d6f62698ba791e21f6be09ff2370216a8..ee203163d099687991f50fbb1037aec38e7b6668 100644 (file)
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -64,14 +64,14 @@
 
 /* in globals.c */
 /* these are marked volatile because they are set by signal handlers: */
-extern DLLIMPORT volatile bool InterruptPending;
+extern PGDLLIMPORT volatile bool InterruptPending;
 extern volatile bool QueryCancelPending;
 extern volatile bool ProcDiePending;
 
 /* these are marked volatile because they are examined by signal handlers: */
 extern volatile bool ImmediateInterruptOK;
-extern DLLIMPORT volatile uint32 InterruptHoldoffCount;
-extern DLLIMPORT volatile uint32 CritSectionCount;
+extern PGDLLIMPORT volatile uint32 InterruptHoldoffCount;
+extern PGDLLIMPORT volatile uint32 CritSectionCount;
 
 /* in tcop/postgres.c */
 extern void ProcessInterrupts(void);
@@ -125,18 +125,18 @@ extern bool IsUnderPostmaster;
 
 extern bool ExitOnAnyError;
 
-extern DLLIMPORT char *DataDir;
+extern PGDLLIMPORT char *DataDir;
 
-extern DLLIMPORT int NBuffers;
+extern PGDLLIMPORT int NBuffers;
 extern int     MaxBackends;
 extern int     MaxConnections;
 
-extern DLLIMPORT int MyProcPid;
-extern DLLIMPORT struct Port *MyProcPort;
+extern PGDLLIMPORT int MyProcPid;
+extern PGDLLIMPORT struct Port *MyProcPort;
 extern long MyCancelKey;
 
 extern char OutputFileName[];
-extern DLLIMPORT char my_exec_path[];
+extern PGDLLIMPORT char my_exec_path[];
 extern char pkglib_path[];
 
 #ifdef EXEC_BACKEND
@@ -148,9 +148,9 @@ extern char postgres_exec_path[];
  *
  * extern BackendId    MyBackendId;
  */
-extern DLLIMPORT Oid MyDatabaseId;
+extern PGDLLIMPORT Oid MyDatabaseId;
 
-extern DLLIMPORT Oid MyDatabaseTableSpace;
+extern PGDLLIMPORT Oid MyDatabaseTableSpace;
 
 /*
  * Date/Time Configuration
@@ -202,8 +202,8 @@ extern int  CTimeZone;
 
 extern bool enableFsync;
 extern bool allowSystemTableMods;
-extern DLLIMPORT int work_mem;
-extern DLLIMPORT int maintenance_work_mem;
+extern PGDLLIMPORT int work_mem;
+extern PGDLLIMPORT int maintenance_work_mem;
 
 extern int     VacuumCostPageHit;
 extern int     VacuumCostPageMiss;

diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 9bbb972c2c8c04fcf2b035a8aff76c7fbb0fc1dd..972bf330be04db437fc41a1a4fc1303a99e4a926 100644 (file)
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -386,7 +386,7 @@ typedef struct Node
  *     Fortunately, this macro isn't recursive so we just define
  *     a global variable for this purpose.
  */
-extern DLLIMPORT Node *newNodeMacroHolder;
+extern PGDLLIMPORT Node *newNodeMacroHolder;
 
 #define newNode(size, tag) \
 ( \

diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index d4ace459904e19a6273d4e5d14c656bf2cb8a363..c22b4f250f0b58f3fa7b6ae2eb18d025d19e1944 100644 (file)
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -36,12 +36,12 @@
  */
 
 /* parameter variables and flags */
-extern DLLIMPORT double seq_page_cost;
-extern DLLIMPORT double random_page_cost;
-extern DLLIMPORT double cpu_tuple_cost;
-extern DLLIMPORT double cpu_index_tuple_cost;
-extern DLLIMPORT double cpu_operator_cost;
-extern DLLIMPORT int effective_cache_size;
+extern PGDLLIMPORT double seq_page_cost;
+extern PGDLLIMPORT double random_page_cost;
+extern PGDLLIMPORT double cpu_tuple_cost;
+extern PGDLLIMPORT double cpu_index_tuple_cost;
+extern PGDLLIMPORT double cpu_operator_cost;
+extern PGDLLIMPORT int effective_cache_size;
 extern Cost disable_cost;
 extern bool enable_seqscan;
 extern bool enable_indexscan;

diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index 261f7f5799d220183bde527a3f34b0bdd8459ffa..b57d1232d93aa6d80dfc206baf1024f0560da4a4 100644 (file)
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -21,7 +21,7 @@ typedef void (*get_relation_info_hook_type) (PlannerInfo *root,
                                                                                         Oid relationObjectId,
                                                                                         bool inhparent,
                                                                                         RelOptInfo *rel);
-extern DLLIMPORT get_relation_info_hook_type get_relation_info_hook;
+extern PGDLLIMPORT get_relation_info_hook_type get_relation_info_hook;
 
 
 extern void get_relation_info(PlannerInfo *root, Oid relationObjectId,

diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 7cfca18a65c35dbfc0cca569533de8a40947b477..0ed106a55f4b531902511cfa7e1ec6c70b64a9d0 100644 (file)
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -22,7 +22,7 @@
 typedef PlannedStmt * (*planner_hook_type) (Query *parse,
                                                                                        int cursorOptions,
                                                                                        ParamListInfo boundParams);
-extern DLLIMPORT planner_hook_type planner_hook;
+extern PGDLLIMPORT planner_hook_type planner_hook;
 
 
 extern PlannedStmt *planner(Query *parse, int cursorOptions,

diff --git a/src/include/port/cygwin.h b/src/include/port/cygwin.h
index 3a7344214e08bdaeba72a082711c3ebf69c9efdf..5524cb48cd07675de1e782321bb2735e6e788ece 100644 (file)
--- a/src/include/port/cygwin.h
+++ b/src/include/port/cygwin.h
@@ -14,8 +14,8 @@
 #endif
 
 #ifdef BUILDING_DLL
-#define DLLIMPORT __declspec (dllexport)
+#define PGDLLIMPORT __declspec (dllexport)
 #else
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 
 #endif

diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index 9e77183f54180b65cd1f37115aed99d26a03c786..70f9597f109538476f0cc4c924c5f92eea47b7c8 100644 (file)
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -51,13 +51,13 @@
 #endif
 
 #ifdef BUILDING_DLL
-#define DLLIMPORT __declspec (dllexport)
+#define PGDLLIMPORT __declspec (dllexport)
 #else                                                  /* not BUILDING_DLL */
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #endif
 #else                                                  /* not CYGWIN, not MSVC, not MingW */
 
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif
 
 
@@ -230,8 +230,8 @@ typedef int pid_t;
 
 
 /* In backend/port/win32/signal.c */
-extern DLLIMPORT volatile int pg_signal_queue;
-extern DLLIMPORT int pg_signal_mask;
+extern PGDLLIMPORT volatile int pg_signal_queue;
+extern PGDLLIMPORT int pg_signal_mask;
 extern HANDLE pgwin32_signal_event;
 extern HANDLE pgwin32_initial_signal_pipe;
 

diff --git a/src/include/postgres.h b/src/include/postgres.h
index 030738ced4a65e01312a26b003a86b713d4236d9..677d5359f13bb1ac7e8e6853fa9123db21428a7f 100644 (file)
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -650,7 +650,7 @@ extern Datum Float8GetDatum(float8 X);
  * ----------------------------------------------------------------
  */
 
-extern DLLIMPORT bool assert_enabled;
+extern PGDLLIMPORT bool assert_enabled;
 
 /*
  * USE_ASSERT_CHECKING, if defined, turns on all the assertions.

diff --git a/src/include/postmaster/syslogger.h b/src/include/postmaster/syslogger.h
index f37af7f411b7cdf3328e901cec058d2f8ffddec8..84746e517f84c70fb7269e27f9f359d539d9beab 100644 (file)
--- a/src/include/postmaster/syslogger.h
+++ b/src/include/postmaster/syslogger.h
@@ -64,8 +64,8 @@ typedef union
 extern bool Redirect_stderr;
 extern int     Log_RotationAge;
 extern int     Log_RotationSize;
-extern DLLIMPORT char *Log_directory;
-extern DLLIMPORT char *Log_filename;
+extern PGDLLIMPORT char *Log_directory;
+extern PGDLLIMPORT char *Log_filename;
 extern bool Log_truncate_on_rotation;
 
 extern bool am_syslogger;

diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index 03a4e1f930c722bb6c74815a7a6e3efe2dd95205..67d42c4f4a9347631b1d9aa7053b2ce2b1db21aa 100644 (file)
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -163,7 +163,7 @@ typedef struct sbufdesc
 
 
 /* in buf_init.c */
-extern DLLIMPORT BufferDesc *BufferDescriptors;
+extern PGDLLIMPORT BufferDesc *BufferDescriptors;
 
 /* in localbuf.c */
 extern BufferDesc *LocalBufferDescriptors;

diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index e38bf5e665df44e622d8eaca481da9d966ec609e..807194861d9c0f5ef8a166dd2ac9aebe3a0c48ca 100644 (file)
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -28,7 +28,7 @@ typedef enum BufferAccessStrategyType
 } BufferAccessStrategyType;
 
 /* in globals.c ... this duplicates miscadmin.h */
-extern DLLIMPORT int NBuffers;
+extern PGDLLIMPORT int NBuffers;
 
 /* in bufmgr.c */
 extern bool zero_damaged_pages;
@@ -36,13 +36,13 @@ extern double bgwriter_lru_percent;
 extern int     bgwriter_lru_maxpages;
 
 /* in buf_init.c */
-extern DLLIMPORT char *BufferBlocks;
-extern DLLIMPORT int32 *PrivateRefCount;
+extern PGDLLIMPORT char *BufferBlocks;
+extern PGDLLIMPORT int32 *PrivateRefCount;
 
 /* in localbuf.c */
-extern DLLIMPORT int NLocBuffer;
-extern DLLIMPORT Block *LocalBufferBlockPointers;
-extern DLLIMPORT int32 *LocalRefCount;
+extern PGDLLIMPORT int NLocBuffer;
+extern PGDLLIMPORT Block *LocalBufferBlockPointers;
+extern PGDLLIMPORT int32 *LocalRefCount;
 
 /* special block number for ReadBuffer() */
 #define P_NEW  InvalidBlockNumber              /* grow the file to get a new page */

diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h
index 1c703198f95ed4f65cf64f3204c2dcde5b0b5cb1..0705ac5fff16e75a5d1387b452bb897fa65325f9 100644 (file)
--- a/src/include/storage/freespace.h
+++ b/src/include/storage/freespace.h
@@ -124,8 +124,8 @@ struct FSMRelation
 
 
 /* GUC variables */
-extern DLLIMPORT int MaxFSMRelations;
-extern DLLIMPORT int MaxFSMPages;
+extern PGDLLIMPORT int MaxFSMRelations;
+extern PGDLLIMPORT int MaxFSMPages;
 
 
 /*

diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 375687c750d94f33538f6587560fbf1714626fc3..1517903e72ce855d671e71bb1cc29cc7fd274821 100644 (file)
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -105,7 +105,7 @@ struct PGPROC
 /* NOTE: "typedef struct PGPROC PGPROC" appears in storage/lock.h. */
 
 
-extern DLLIMPORT PGPROC *MyProc;
+extern PGDLLIMPORT PGPROC *MyProc;
 
 
 /*

diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index b591962417ff68622b2ae67a984124d76cbe5c01..99b4c8269b1d1e2a413d2e1976bfbbd3b9fb9dda 100644 (file)
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -34,7 +34,7 @@ typedef unsigned long SHMEM_OFFSET;
  * The macros in this header file can only cope with offsets into this
  * shared memory region!
  */
-extern DLLIMPORT SHMEM_OFFSET ShmemBase;
+extern PGDLLIMPORT SHMEM_OFFSET ShmemBase;
 
 
 /* coerce an offset into a pointer in this process's address space */

diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h
index 9ebb28471aafddcbfede5cc63be37d62426db583..1f59443b14b519efc562cc941be5fcd8170c4816 100644 (file)
--- a/src/include/tcop/pquery.h
+++ b/src/include/tcop/pquery.h
@@ -18,7 +18,7 @@
 #include "utils/portal.h"
 
 
-extern DLLIMPORT Portal ActivePortal;
+extern PGDLLIMPORT Portal ActivePortal;
 
 
 extern PortalStrategy ChoosePortalStrategy(List *stmts);

diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index ce8def13f36f133ae9d2fddde71b875d439899ad..f9e3af8c0b66ac238ce6ca9ef3fb36cab1a3c60a 100644 (file)
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -28,7 +28,7 @@
 #define STACK_DEPTH_SLOP (512 * 1024L)
 
 extern CommandDest whereToSendOutput;
-extern DLLIMPORT const char *debug_query_string;
+extern PGDLLIMPORT const char *debug_query_string;
 extern int     max_stack_depth;
 extern int     PostAuthDelay;
 

diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index ead5763bc4ac999b387eab7f95020d4c2cbf416b..cd18c3a91bc0fbf7a58769e8d1c00b9015234d7a 100644 (file)
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -271,7 +271,7 @@ extern Datum btname_pattern_cmp(PG_FUNCTION_ARGS);
 extern Datum bttext_pattern_cmp(PG_FUNCTION_ARGS);
 
 /* float.c */
-extern DLLIMPORT int extra_float_digits;
+extern PGDLLIMPORT int extra_float_digits;
 
 extern double get_float8_infinity(void);
 extern float get_float4_infinity(void);

diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index ebf4797d7cd79b46515e63545b97deb77dc3cb29..b3d27082f52d4e6eb46bd97a10f59bee06cfd370 100644 (file)
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -157,7 +157,7 @@ typedef struct catcacheheader
 
 
 /* this extern duplicates utils/memutils.h... */
-extern DLLIMPORT MemoryContext CacheMemoryContext;
+extern PGDLLIMPORT MemoryContext CacheMemoryContext;
 
 extern void CreateCacheMemoryContext(void);
 extern void AtEOXact_CatCache(bool isCommit);

diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 747301b46220f901253516d763d1fcb4d0dd884d..22a7bcb923396c6d714573c831d3c6bddfea5af5 100644 (file)
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -173,7 +173,7 @@ typedef struct ErrorContextCallback
        void       *arg;
 } ErrorContextCallback;
 
-extern DLLIMPORT ErrorContextCallback *error_context_stack;
+extern PGDLLIMPORT ErrorContextCallback *error_context_stack;
 
 
 /*----------
@@ -234,7 +234,7 @@ extern DLLIMPORT ErrorContextCallback *error_context_stack;
        (pg_re_throw(), exit(1))
 #endif
 
-extern DLLIMPORT sigjmp_buf *PG_exception_stack;
+extern PGDLLIMPORT sigjmp_buf *PG_exception_stack;
 
 
 /* Stuff that error handlers might want to use */

diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 7751ce9c430ddffdffcb396941efe0584dd93ae3..8c758755cca210b1d9ea58debf94d8fde25fae86 100644 (file)
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -115,7 +115,7 @@ extern bool log_executor_stats;
 extern bool log_statement_stats;
 extern bool log_btree_build_stats;
 
-extern DLLIMPORT bool check_function_bodies;
+extern PGDLLIMPORT bool check_function_bodies;
 extern bool default_with_oids;
 extern bool SQL_inheritance;
 

diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index a08a657e7df1e539f087fda367799aceae345374..620731c44db02cd0b6889fd611e62cb346478d53 100644 (file)
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -67,16 +67,16 @@ typedef struct StandardChunkHeader
  * Only TopMemoryContext and ErrorContext are initialized by
  * MemoryContextInit() itself.
  */
-extern DLLIMPORT MemoryContext TopMemoryContext;
-extern DLLIMPORT MemoryContext ErrorContext;
-extern DLLIMPORT MemoryContext PostmasterContext;
-extern DLLIMPORT MemoryContext CacheMemoryContext;
-extern DLLIMPORT MemoryContext MessageContext;
-extern DLLIMPORT MemoryContext TopTransactionContext;
-extern DLLIMPORT MemoryContext CurTransactionContext;
+extern PGDLLIMPORT MemoryContext TopMemoryContext;
+extern PGDLLIMPORT MemoryContext ErrorContext;
+extern PGDLLIMPORT MemoryContext PostmasterContext;
+extern PGDLLIMPORT MemoryContext CacheMemoryContext;
+extern PGDLLIMPORT MemoryContext MessageContext;
+extern PGDLLIMPORT MemoryContext TopTransactionContext;
+extern PGDLLIMPORT MemoryContext CurTransactionContext;
 
 /* This is a transient link to the active portal's memory context: */
-extern DLLIMPORT MemoryContext PortalContext;
+extern PGDLLIMPORT MemoryContext PortalContext;
 
 
 /*

diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index 2dede3123b23d1161a0baecb0f7d53fb893fd5e3..9b720391d1c936b40e79a50312158aceacfb3c25 100644 (file)
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -40,7 +40,7 @@ typedef struct MemoryContextData *MemoryContext;
  * We declare it here so that palloc() can be a macro. Avoid accessing it
  * directly!  Instead, use MemoryContextSwitchTo() to change the setting.
  */
-extern DLLIMPORT MemoryContext CurrentMemoryContext;
+extern PGDLLIMPORT MemoryContext CurrentMemoryContext;
 
 /*
  * Fundamental memory-allocation operations (more are in utils/memutils.h)

diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h
index 76229bc19da3f06617d371ad6fbdcd92fd4bc26f..92d631fd2c6ca7e8e63195de9a14a4e8f8288346 100644 (file)
--- a/src/include/utils/resowner.h
+++ b/src/include/utils/resowner.h
@@ -34,9 +34,9 @@ typedef struct ResourceOwnerData *ResourceOwner;
 /*
  * Globally known ResourceOwners
  */
-extern DLLIMPORT ResourceOwner CurrentResourceOwner;
-extern DLLIMPORT ResourceOwner CurTransactionResourceOwner;
-extern DLLIMPORT ResourceOwner TopTransactionResourceOwner;
+extern PGDLLIMPORT ResourceOwner CurrentResourceOwner;
+extern PGDLLIMPORT ResourceOwner CurTransactionResourceOwner;
+extern PGDLLIMPORT ResourceOwner TopTransactionResourceOwner;
 
 /*
  * Resource releasing is done in three phases: pre-locks, locks, and

diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 632e034c9bcadb700e1e82e388d8e2f2949b01f4..306ff66a6489c1823377d0a2af6104b8636bc14f 100644 (file)
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -61,10 +61,10 @@ typedef struct SnapshotData
 #define InvalidSnapshot                ((Snapshot) NULL)
 
 /* Static variables representing various special snapshot semantics */
-extern DLLIMPORT SnapshotData SnapshotNowData;
-extern DLLIMPORT SnapshotData SnapshotSelfData;
-extern DLLIMPORT SnapshotData SnapshotAnyData;
-extern DLLIMPORT SnapshotData SnapshotToastData;
+extern PGDLLIMPORT SnapshotData SnapshotNowData;
+extern PGDLLIMPORT SnapshotData SnapshotSelfData;
+extern PGDLLIMPORT SnapshotData SnapshotAnyData;
+extern PGDLLIMPORT SnapshotData SnapshotToastData;
 
 #define SnapshotNow                    (&SnapshotNowData)
 #define SnapshotSelf           (&SnapshotSelfData)
@@ -84,9 +84,9 @@ extern DLLIMPORT SnapshotData SnapshotToastData;
        ((snapshot)->satisfies == HeapTupleSatisfiesMVCC)
 
 
-extern DLLIMPORT Snapshot SerializableSnapshot;
-extern DLLIMPORT Snapshot LatestSnapshot;
-extern DLLIMPORT Snapshot ActiveSnapshot;
+extern PGDLLIMPORT Snapshot SerializableSnapshot;
+extern PGDLLIMPORT Snapshot LatestSnapshot;
+extern PGDLLIMPORT Snapshot ActiveSnapshot;
 
 extern TransactionId TransactionXmin;
 extern TransactionId RecentXmin;

diff --git a/src/interfaces/ecpg/include/sqlca.h b/src/interfaces/ecpg/include/sqlca.h
index 32a09be0be0e0712b3954515052d5a08cc28fb01..52fcbf830f592f2c82957da77735417cf7a0ba62 100644 (file)
--- a/src/interfaces/ecpg/include/sqlca.h
+++ b/src/interfaces/ecpg/include/sqlca.h
@@ -1,13 +1,13 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c
index 1c2f8b4e2dff8e8f18cbb606ab8a05c6a1aa380d..e83779deb517a2ec94a69d398bc589255a5872af 100644 (file)
--- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c
+++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c
@@ -19,13 +19,13 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/interfaces/ecpg/test/expected/preproc-init.c b/src/interfaces/ecpg/test/expected/preproc-init.c
index e0fc30b63bec9fc7c94c3599bbca033c3a5320e7..68af154da81d23372c3dec7048bfa55bf961d6f4 100644 (file)
--- a/src/interfaces/ecpg/test/expected/preproc-init.c
+++ b/src/interfaces/ecpg/test/expected/preproc-init.c
@@ -13,13 +13,13 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/interfaces/ecpg/test/expected/sql-array.c b/src/interfaces/ecpg/test/expected/sql-array.c
index 2d74c7c899e81cbd53bae1c30db9938dc8416a52..f63d7247f1ef0a21836599e03ab917f1349e54b5 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-array.c
+++ b/src/interfaces/ecpg/test/expected/sql-array.c
@@ -21,13 +21,13 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/interfaces/ecpg/test/expected/sql-code100.c b/src/interfaces/ecpg/test/expected/sql-code100.c
index efff83aa5d686b8fcec9a314aac7a5fbd1fa744f..c37d82c2e1871a10adf95ac09622226c336355ef 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-code100.c
+++ b/src/interfaces/ecpg/test/expected/sql-code100.c
@@ -13,13 +13,13 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/interfaces/ecpg/test/expected/sql-copystdout.c b/src/interfaces/ecpg/test/expected/sql-copystdout.c
index a55dc57bad04983e84d889f0937b2f00016ecdba..3b39688ff13af7dde90e6fdeb95391f88834d951 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-copystdout.c
+++ b/src/interfaces/ecpg/test/expected/sql-copystdout.c
@@ -15,13 +15,13 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/interfaces/ecpg/test/expected/sql-define.c b/src/interfaces/ecpg/test/expected/sql-define.c
index eb571ceb314c291ffe84a7698ca6dc8f9493b4f4..e3b725fe9750b309a2a0a483abe84434205e4d03 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-define.c
+++ b/src/interfaces/ecpg/test/expected/sql-define.c
@@ -13,13 +13,13 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc.c b/src/interfaces/ecpg/test/expected/sql-dynalloc.c
index 99435a337d154dd3c949c4f956bba399581a76f3..0a9d71c3610f20ad6a2e9b9acde3314a33055539 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-dynalloc.c
+++ b/src/interfaces/ecpg/test/expected/sql-dynalloc.c
@@ -14,13 +14,13 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc2.c b/src/interfaces/ecpg/test/expected/sql-dynalloc2.c
index 233ad4397097023acfd2ae842ddac0965294a8b7..2f3a76192b7f51101202260d36fac86b7faabea1 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-dynalloc2.c
+++ b/src/interfaces/ecpg/test/expected/sql-dynalloc2.c
@@ -14,13 +14,13 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/interfaces/ecpg/test/expected/sql-dyntest.c b/src/interfaces/ecpg/test/expected/sql-dyntest.c
index 26c5652394738cbcdf5af66825670731987e8738..075d2bba81acefee9ec51a6a9a60f0869f8428c2 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-dyntest.c
+++ b/src/interfaces/ecpg/test/expected/sql-dyntest.c
@@ -67,13 +67,13 @@ enum
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/interfaces/ecpg/test/expected/sql-indicators.c b/src/interfaces/ecpg/test/expected/sql-indicators.c
index 4d080899a5db077d59c4803eac64b1d5c74a0a49..781a7216a07c0c59e9e245c60c89353ba33bbfec 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-indicators.c
+++ b/src/interfaces/ecpg/test/expected/sql-indicators.c
@@ -15,13 +15,13 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
-#ifndef DLLIMPORT
+#ifndef PGDLLIMPORT
 #if  defined(WIN32) || defined(__CYGWIN__)
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 #else
-#define DLLIMPORT
+#define PGDLLIMPORT
 #endif   /* __CYGWIN__ */
-#endif   /* DLLIMPORT */
+#endif   /* PGDLLIMPORT */
 
 #define SQLERRMC_LEN   150
 

diff --git a/src/port/copydir.c b/src/port/copydir.c
index 698a6e72920822520a1f857a604dc4a05e97b6eb..80b4ec572bf31f14723bde8b9f6076bf050f11bd 100644 (file)
--- a/src/port/copydir.c
+++ b/src/port/copydir.c
@@ -26,7 +26,7 @@
 
 /*
  *     On Windows, call non-macro versions of palloc; we can't reference
- *     CurrentMemoryContext in this file because of DLLIMPORT conflict.
+ *     CurrentMemoryContext in this file because of PGDLLIMPORT conflict.
  */
 #if defined(WIN32) || defined(__CYGWIN__)
 #undef palloc

diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index aecabd381d5edc0acc615f1aa63cd2650580faf6..1069b01cef71f92a3e5be39823c468d15cad0452 100644 (file)
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -45,7 +45,7 @@
 
 /*
  *     On Windows, call non-macro versions of palloc; we can't reference
- *     CurrentMemoryContext in this file because of DLLIMPORT conflict.
+ *     CurrentMemoryContext in this file because of PGDLLIMPORT conflict.
  */
 #if defined(WIN32) || defined(__CYGWIN__)
 #undef palloc