diff options
author | Robert Haas <rhaas@postgresql.org> | 2017-12-05 09:24:12 -0500 |
---|---|---|
committer | Robert Haas <rhaas@postgresql.org> | 2017-12-05 09:35:15 -0500 |
commit | f4bb60ed69d8d88beef8fa22ad2fcbb99769ef4d (patch) | |
tree | e03dc9948b86019b3473430d20d5d5074fc8b09f | |
parent | 225501cf754f1ce0fd0c793c0c991f40e96344e1 (diff) | |
download | postgresql-f4bb60ed69d8d88beef8fa22ad2fcbb99769ef4d.tar.gz |
Mark assorted variables PGDLLIMPORT.
This makes life easier for extension authors who wish to support
Windows.
Brian Cloutier, slightly amended by me.
Discussion: http://postgr.es/m/CAJCy68fscdNhmzFPS4kyO00CADkvXvEa-28H-OtENk-pa2OTWw@mail.gmail.com
-rw-r--r-- | src/include/access/twophase.h | 2 | ||||
-rw-r--r-- | src/include/commands/extension.h | 4 | ||||
-rw-r--r-- | src/include/miscadmin.h | 10 | ||||
-rw-r--r-- | src/include/pgtime.h | 2 | ||||
-rw-r--r-- | src/include/postmaster/postmaster.h | 4 | ||||
-rw-r--r-- | src/include/storage/fd.h | 2 | ||||
-rw-r--r-- | src/include/storage/proc.h | 4 | ||||
-rw-r--r-- | src/include/tcop/dest.h | 3 | ||||
-rw-r--r-- | src/include/tcop/tcopprot.h | 2 | ||||
-rw-r--r-- | src/include/utils/guc.h | 6 | ||||
-rw-r--r-- | src/include/utils/snapmgr.h | 8 |
11 files changed, 24 insertions, 23 deletions
diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h index 80079b2a9b..74d8f1c9d8 100644 --- a/src/include/access/twophase.h +++ b/src/include/access/twophase.h @@ -25,7 +25,7 @@ typedef struct GlobalTransactionData *GlobalTransaction; /* GUC variable */ -extern int max_prepared_xacts; +extern PGDLLIMPORT int max_prepared_xacts; extern Size TwoPhaseShmemSize(void); extern void TwoPhaseShmemInit(void); diff --git a/src/include/commands/extension.h b/src/include/commands/extension.h index 2cf784b455..967e24b736 100644 --- a/src/include/commands/extension.h +++ b/src/include/commands/extension.h @@ -23,8 +23,8 @@ * on the current pg_extension object for each SQL object created by its * installation script. */ -extern bool creating_extension; -extern Oid CurrentExtensionObject; +extern PGDLLIMPORT bool creating_extension; +extern PGDLLIMPORT Oid CurrentExtensionObject; extern Oid CreateExtension(CreateExtensionStmt *stmt); diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 5ecdb255ed..9504a06e8f 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -152,14 +152,14 @@ extern PGDLLIMPORT bool IsUnderPostmaster; extern bool IsBackgroundWorker; extern bool IsBinaryUpgrade; -extern bool ExitOnAnyError; +extern PGDLLIMPORT bool ExitOnAnyError; extern PGDLLIMPORT char *DataDir; extern PGDLLIMPORT int NBuffers; -extern int MaxBackends; -extern int MaxConnections; -extern int max_worker_processes; +extern PGDLLIMPORT int MaxBackends; +extern PGDLLIMPORT int MaxConnections; +extern PGDLLIMPORT int max_worker_processes; extern PGDLLIMPORT int MyProcPid; extern PGDLLIMPORT pg_time_t MyStartTime; @@ -238,7 +238,7 @@ extern PGDLLIMPORT int IntervalStyle; #define MAXTZLEN 10 /* max TZ name len, not counting tr. null */ extern bool enableFsync; -extern bool allowSystemTableMods; +extern PGDLLIMPORT bool allowSystemTableMods; extern PGDLLIMPORT int work_mem; extern PGDLLIMPORT int maintenance_work_mem; diff --git a/src/include/pgtime.h b/src/include/pgtime.h index a85bc2781b..d9a11caf1c 100644 --- a/src/include/pgtime.h +++ b/src/include/pgtime.h @@ -70,7 +70,7 @@ extern size_t pg_strftime(char *s, size_t max, const char *format, /* these functions and variables are in pgtz.c */ -extern pg_tz *session_timezone; +extern PGDLLIMPORT pg_tz *session_timezone; extern pg_tz *log_timezone; extern void pg_timezone_initialize(void); diff --git a/src/include/postmaster/postmaster.h b/src/include/postmaster/postmaster.h index de46332780..4a06f10a25 100644 --- a/src/include/postmaster/postmaster.h +++ b/src/include/postmaster/postmaster.h @@ -16,7 +16,7 @@ /* GUC options */ extern bool EnableSSL; extern int ReservedBackends; -extern int PostPortNumber; +extern PGDLLIMPORT int PostPortNumber; extern int Unix_socket_permissions; extern char *Unix_socket_group; extern char *Unix_socket_directories; @@ -44,7 +44,7 @@ extern int postmaster_alive_fds[2]; #define POSTMASTER_FD_OWN 1 /* kept open by postmaster only */ #endif -extern const char *progname; +extern PGDLLIMPORT const char *progname; extern void PostmasterMain(int argc, char *argv[]) __attribute__((noreturn)); extern void ClosePostmasterPorts(bool am_syslogger); diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index 08c07dba9e..c286d06d64 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -52,7 +52,7 @@ typedef int File; /* GUC parameter */ -extern int max_files_per_process; +extern PGDLLIMPORT int max_files_per_process; /* * This is private to fd.c, but exported for save/restore_backend_variables() diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 4ad4164927..ec34cfd219 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -207,7 +207,7 @@ typedef struct PROC_HDR int startupBufferPinWaitBufId; } PROC_HDR; -extern PROC_HDR *ProcGlobal; +extern PGDLLIMPORT PROC_HDR *ProcGlobal; extern PGPROC *PreparedXactProcs; @@ -223,7 +223,7 @@ extern PGPROC *PreparedXactProcs; /* configurable options */ -extern int DeadlockTimeout; +extern PGDLLIMPORT int DeadlockTimeout; extern int StatementTimeout; extern int LockTimeout; extern bool log_lock_waits; diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index d53a6c8c12..53764839aa 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -125,7 +125,8 @@ struct _DestReceiver /* Private fields might appear beyond this point... */ }; -extern DestReceiver *None_Receiver; /* permanent receiver for DestNone */ +extern PGDLLIMPORT DestReceiver *None_Receiver; /* permanent receiver for + * DestNone */ /* The primary destination management functions */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index 60f75325db..cc3ad9ebf2 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -44,7 +44,7 @@ typedef enum LOGSTMT_ALL /* log all statements */ } LogStmtLevel; -extern int log_statement; +extern PGDLLIMPORT int log_statement; extern List *pg_parse_query(const char *query_string); extern List *pg_analyze_and_rewrite(Node *parsetree, const char *query_string, diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 7212964ec0..564cf9255d 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -226,8 +226,8 @@ extern bool default_with_oids; extern bool SQL_inheritance; extern int log_min_error_statement; -extern int log_min_messages; -extern int client_min_messages; +extern PGDLLIMPORT int log_min_messages; +extern PGDLLIMPORT int client_min_messages; extern int log_min_duration_statement; extern int log_temp_files; @@ -236,7 +236,7 @@ extern int temp_file_limit; extern int num_temp_buffers; extern char *data_directory; -extern char *ConfigFileName; +extern PGDLLIMPORT char *ConfigFileName; extern char *HbaFileName; extern char *IdentFileName; extern char *external_pid_file; diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h index e3204fdd86..c6aa361950 100644 --- a/src/include/utils/snapmgr.h +++ b/src/include/utils/snapmgr.h @@ -20,10 +20,10 @@ extern bool FirstSnapshotSet; -extern TransactionId TransactionXmin; -extern TransactionId RecentXmin; -extern TransactionId RecentGlobalXmin; -extern TransactionId RecentGlobalDataXmin; +extern PGDLLIMPORT TransactionId TransactionXmin; +extern PGDLLIMPORT TransactionId RecentXmin; +extern PGDLLIMPORT TransactionId RecentGlobalXmin; +extern PGDLLIMPORT TransactionId RecentGlobalDataXmin; extern Snapshot GetTransactionSnapshot(void); extern Snapshot GetLatestSnapshot(void); |