Skip to content

P
Postgres FD Implementation
Commit 906b2e1b authored by Magnus Hagander's avatar Magnus Hagander
Browse files
Options

Rename DLLIMPORT macro to PGDLLIMPORT to avoid conflict with 

third party includes (like tcl) that define DLLIMPORT.
parent 5cbb1192
Show whitespace changes
Inline Side-by-side
Showing with 163 additions and 163 deletions
src/backend/utils/mmgr/mcxt.c
View file @ 906b2e1b
......@@ -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)
{
......
src/include/access/gin.h
View file @ 906b2e1b
......@@ -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 )
......
src/include/c.h
View file @ 906b2e1b
......@@ -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
/*
......
src/include/commands/explain.h
View file @ 906b2e1b
......@@ -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,
......
src/include/commands/vacuum.h
View file @ 906b2e1b
......@@ -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;
......
src/include/executor/spi.h
View file @ 906b2e1b
......@@ -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);
......
src/include/fmgr.h
View file @ 906b2e1b
......@@ -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) \
{ \
......
src/include/miscadmin.h
View file @ 906b2e1b
......@@ -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;
......
src/include/nodes/nodes.h
View file @ 906b2e1b
......@@ -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) \
( \
......
src/include/optimizer/cost.h
View file @ 906b2e1b
......@@ -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;
......
src/include/optimizer/plancat.h
View file @ 906b2e1b
......@@ -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,
......
src/include/optimizer/planner.h
View file @ 906b2e1b
......@@ -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,
......
src/include/port/cygwin.h
View file @ 906b2e1b
/* $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 <cygwin/version.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
src/include/port/win32.h
View file @ 906b2e1b
/* $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;
......
src/include/postgres.h
View file @ 906b2e1b
......@@ -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.
......
src/include/postmaster/syslogger.h
View file @ 906b2e1b
......@@ -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;
......
src/include/storage/buf_internals.h
View file @ 906b2e1b
......@@ -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;
......
src/include/storage/bufmgr.h
View file @ 906b2e1b
......@@ -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 */
......
src/include/storage/freespace.h
View file @ 906b2e1b
......@@ -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;
/*
......
src/include/storage/proc.h
View file @ 906b2e1b
......@@ -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;
/*
......
src/include/storage/shmem.h
View file @ 906b2e1b
......@@ -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 */
......
src/include/tcop/pquery.h
View file @ 906b2e1b
......@@ -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);
......
src/include/tcop/tcopprot.h
View file @ 906b2e1b
......@@ -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;
......
src/include/utils/builtins.h
View file @ 906b2e1b
......@@ -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);
......
src/include/utils/catcache.h
View file @ 906b2e1b
......@@ -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);
......
src/include/utils/elog.h
View file @ 906b2e1b
......@@ -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 */
......
src/include/utils/guc.h
View file @ 906b2e1b
......@@ -7,7 +7,7 @@
* Copyright (c) 2000-2007, PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* $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;
......
src/include/utils/memutils.h
View file @ 906b2e1b
......@@ -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;
/*
......
src/include/utils/palloc.h
View file @ 906b2e1b
......@@ -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)
......
src/include/utils/resowner.h
View file @ 906b2e1b
......@@ -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
......
src/include/utils/tqual.h
View file @ 906b2e1b
......@@ -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;
......
src/interfaces/ecpg/include/sqlca.h
View file @ 906b2e1b
#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
......
src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c
View file @ 906b2e1b
......@@ -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
......
src/interfaces/ecpg/test/expected/preproc-init.c
View file @ 906b2e1b
......@@ -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
......
src/interfaces/ecpg/test/expected/sql-array.c
View file @ 906b2e1b
......@@ -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
......
src/interfaces/ecpg/test/expected/sql-code100.c
View file @ 906b2e1b
......@@ -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
......
src/interfaces/ecpg/test/expected/sql-copystdout.c
View file @ 906b2e1b
......@@ -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
......
src/interfaces/ecpg/test/expected/sql-define.c
View file @ 906b2e1b
......@@ -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
......
src/interfaces/ecpg/test/expected/sql-dynalloc.c
View file @ 906b2e1b
......@@ -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
......
src/interfaces/ecpg/test/expected/sql-dynalloc2.c
View file @ 906b2e1b
......@@ -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
......
src/interfaces/ecpg/test/expected/sql-dyntest.c
View file @ 906b2e1b
......@@ -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
......
src/interfaces/ecpg/test/expected/sql-indicators.c
View file @ 906b2e1b
......@@ -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
......
src/port/copydir.c
View file @ 906b2e1b
......@@ -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
......
src/port/dirmod.c
View file @ 906b2e1b
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment