From 906b2e1b37d351fd54f4bcfd66167e14dbb51818 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Wed, 25 Jul 2007 12:22:54 +0000 Subject: [PATCH] Rename DLLIMPORT macro to PGDLLIMPORT to avoid conflict with third party includes (like tcl) that define DLLIMPORT. --- src/backend/utils/mmgr/mcxt.c | 8 +++--- src/include/access/gin.h | 4 +-- src/include/c.h | 6 ++--- src/include/commands/explain.h | 6 ++--- src/include/commands/vacuum.h | 4 +-- src/include/executor/spi.h | 10 +++---- src/include/fmgr.h | 8 +++--- src/include/miscadmin.h | 26 +++++++++---------- src/include/nodes/nodes.h | 4 +-- src/include/optimizer/cost.h | 14 +++++----- src/include/optimizer/plancat.h | 4 +-- src/include/optimizer/planner.h | 4 +-- src/include/port/cygwin.h | 6 ++--- src/include/port/win32.h | 12 ++++----- src/include/postgres.h | 4 +-- src/include/postmaster/syslogger.h | 6 ++--- src/include/storage/buf_internals.h | 4 +-- src/include/storage/bufmgr.h | 14 +++++----- src/include/storage/freespace.h | 6 ++--- src/include/storage/proc.h | 4 +-- src/include/storage/shmem.h | 4 +-- src/include/tcop/pquery.h | 4 +-- src/include/tcop/tcopprot.h | 4 +-- src/include/utils/builtins.h | 4 +-- src/include/utils/catcache.h | 4 +-- src/include/utils/elog.h | 6 ++--- src/include/utils/guc.h | 4 +-- src/include/utils/memutils.h | 18 ++++++------- src/include/utils/palloc.h | 4 +-- src/include/utils/resowner.h | 8 +++--- src/include/utils/tqual.h | 16 ++++++------ src/interfaces/ecpg/include/sqlca.h | 8 +++--- .../expected/compat_informix-test_informix2.c | 8 +++--- .../ecpg/test/expected/preproc-init.c | 8 +++--- src/interfaces/ecpg/test/expected/sql-array.c | 8 +++--- .../ecpg/test/expected/sql-code100.c | 8 +++--- .../ecpg/test/expected/sql-copystdout.c | 8 +++--- .../ecpg/test/expected/sql-define.c | 8 +++--- .../ecpg/test/expected/sql-dynalloc.c | 8 +++--- .../ecpg/test/expected/sql-dynalloc2.c | 8 +++--- .../ecpg/test/expected/sql-dyntest.c | 8 +++--- .../ecpg/test/expected/sql-indicators.c | 8 +++--- src/port/copydir.c | 4 +-- src/port/dirmod.c | 4 +-- 44 files changed, 163 insertions(+), 163 deletions(-) diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 3337f819ee..88a91c4748 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.60 2007/03/13 00:33:42 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.61 2007/07/25 12:22:52 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 4e4259363d..b22fbd1a08 100644 --- a/src/include/access/gin.h +++ b/src/include/access/gin.h @@ -3,7 +3,7 @@ * header file for postgres inverted index access method implementation. * * Copyright (c) 2006, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.11 2007/04/09 22:04:04 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.12 2007/07/25 12:22:53 mha Exp $ *-------------------------------------------------------------------------- */ @@ -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 73b72a816a..35e7bb9150 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/c.h,v 1.219 2007/02/27 23:48:09 tgl Exp $ + * $PostgreSQL: pgsql/src/include/c.h,v 1.220 2007/07/25 12:22:52 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 73bf41e49c..0d22449e52 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.31 2007/05/25 17:54:25 tgl Exp $ + * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.32 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 50a475bc5e..4d97e9930d 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.72 2007/05/30 20:12:03 tgl Exp $ + * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.73 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 c996f644c0..20beefe440 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.61 2007/04/16 01:14:57 tgl Exp $ + * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.62 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 32cadeb6b5..4d246ab81d 100644 --- a/src/include/fmgr.h +++ b/src/include/fmgr.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/fmgr.h,v 1.51 2007/05/15 17:39:54 momjian Exp $ + * $PostgreSQL: pgsql/src/include/fmgr.h,v 1.52 2007/07/25 12:22:52 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 c5090581c5..c276742277 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.194 2007/04/16 18:29:56 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.195 2007/07/25 12:22:53 mha Exp $ * * NOTES * some of the information in this file should be moved to other files. @@ -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 c54a1a4522..92bd19e999 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.201 2007/06/11 01:16:30 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.202 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 138741e07a..dc052dcf55 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.87 2007/05/21 17:57:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.88 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 a19ba780ee..0d2a075caf 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.44 2007/05/25 17:54:25 tgl Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.45 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 a08a83ae71..337cca002e 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.40 2007/05/25 17:54:25 tgl Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.41 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 1a1be83b8f..6d46f0c774 100644 --- a/src/include/port/cygwin.h +++ b/src/include/port/cygwin.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.6 2003/12/23 03:31:30 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.7 2007/07/25 12:22:53 mha Exp $ */ #include @@ -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 e05ab50ca7..7397ea642e 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.75 2007/07/24 09:00:27 mha Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.76 2007/07/25 12:22:53 mha Exp $ */ #if defined(_MSC_VER) || defined(__BORLANDC__) #define WIN32_ONLY_COMPILER @@ -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 3f65d64631..019d2c9f6e 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postgres.h,v 1.81 2007/05/15 17:39:54 momjian Exp $ + * $PostgreSQL: pgsql/src/include/postgres.h,v 1.82 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 72c14c99cd..535e4392c4 100644 --- a/src/include/postmaster/syslogger.h +++ b/src/include/postmaster/syslogger.h @@ -5,7 +5,7 @@ * * Copyright (c) 2004-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.9 2007/06/14 01:48:51 adunstan Exp $ + * $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.10 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 b6772f90f2..4afd677b9a 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.91 2007/06/28 00:02:40 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.92 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 95c603f961..7a4190d044 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.105 2007/06/28 00:02:40 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.106 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 961bc262fa..1e3efe12f3 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.25 2007/01/05 22:19:57 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.26 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 1fd4e264f0..756b0ffb0e 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.98 2007/04/16 18:30:04 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.99 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 80565c1724..5ad78e83cc 100644 --- a/src/include/storage/shmem.h +++ b/src/include/storage/shmem.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/shmem.h,v 1.51 2007/06/25 17:12:07 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/storage/shmem.h,v 1.52 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 abf64f0ebf..261b546de2 100644 --- a/src/include/tcop/pquery.h +++ b/src/include/tcop/pquery.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/pquery.h,v 1.42 2007/03/13 00:33:43 tgl Exp $ + * $PostgreSQL: pgsql/src/include/tcop/pquery.h,v 1.43 2007/07/25 12:22:54 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 613d9a9983..97341efaf0 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.89 2007/04/16 01:14:58 tgl Exp $ + * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.90 2007/07/25 12:22:54 mha Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -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 3c3a9ed2d4..de677902d4 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.298 2007/07/17 05:02:02 neilc Exp $ + * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.299 2007/07/25 12:22:54 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 f34bb05c1d..c203057ac6 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.64 2007/01/05 22:19:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.65 2007/07/25 12:22:54 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 6a4809a339..0ad41c65b3 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.86 2007/05/04 02:01:02 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.87 2007/07/25 12:22:54 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 d1f2eb43f4..2111a41cf6 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -7,7 +7,7 @@ * Copyright (c) 2000-2007, PostgreSQL Global Development Group * Written by Peter Eisentraut . * - * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.82 2007/06/03 17:08:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.83 2007/07/25 12:22:54 mha Exp $ *-------------------------------------------------------------------- */ #ifndef 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 f046f397e8..1541bef496 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/memutils.h,v 1.62 2007/03/13 00:33:43 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/memutils.h,v 1.63 2007/07/25 12:22:54 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 1bddb8e690..3b158628d4 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -21,7 +21,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/palloc.h,v 1.36 2007/01/05 22:19:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/palloc.h,v 1.37 2007/07/25 12:22:54 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 ea0d6a7406..a7c9aece17 100644 --- a/src/include/utils/resowner.h +++ b/src/include/utils/resowner.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.11 2007/03/13 00:33:43 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.12 2007/07/25 12:22:54 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 e3596e2d50..2baf7968fd 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.66 2007/03/25 19:45:14 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.67 2007/07/25 12:22:54 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 32a09be0be..52fcbf830f 100644 --- 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 1c2f8b4e2d..e83779deb5 100644 --- 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 e0fc30b63b..68af154da8 100644 --- 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 2d74c7c899..f63d7247f1 100644 --- 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 efff83aa5d..c37d82c2e1 100644 --- 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 a55dc57bad..3b39688ff1 100644 --- 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 eb571ceb31..e3b725fe97 100644 --- 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 99435a337d..0a9d71c361 100644 --- 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 233ad43970..2f3a76192b 100644 --- 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 26c5652394..075d2bba81 100644 --- 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 4d080899a5..781a7216a0 100644 --- 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 4310f2a709..8e0601e667 100644 --- a/src/port/copydir.c +++ b/src/port/copydir.c @@ -11,7 +11,7 @@ * as a service. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/copydir.c,v 1.19 2007/01/05 22:20:02 momjian Exp $ + * $PostgreSQL: pgsql/src/port/copydir.c,v 1.20 2007/07/25 12:22:54 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 beec1272ce..4105ae7efe 100644 --- a/src/port/dirmod.c +++ b/src/port/dirmod.c @@ -10,7 +10,7 @@ * Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.48 2007/07/12 23:28:49 tgl Exp $ + * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.49 2007/07/25 12:22:54 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 -- 2.40.0