Skip to content

Commit f4bb60e

Browse files
committed
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
1 parent 225501c commit f4bb60e

File tree

11 files changed

+24
-23
lines changed

11 files changed

+24
-23
lines changed

src/include/access/twophase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
typedef struct GlobalTransactionData *GlobalTransaction;
2626

2727
/* GUC variable */
28-
extern int max_prepared_xacts;
28+
extern PGDLLIMPORT int max_prepared_xacts;
2929

3030
extern Size TwoPhaseShmemSize(void);
3131
extern void TwoPhaseShmemInit(void);

src/include/commands/extension.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
* on the current pg_extension object for each SQL object created by its
2424
* installation script.
2525
*/
26-
extern bool creating_extension;
27-
extern Oid CurrentExtensionObject;
26+
extern PGDLLIMPORT bool creating_extension;
27+
extern PGDLLIMPORT Oid CurrentExtensionObject;
2828

2929

3030
extern Oid CreateExtension(CreateExtensionStmt *stmt);

src/include/miscadmin.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,14 @@ extern PGDLLIMPORT bool IsUnderPostmaster;
152152
extern bool IsBackgroundWorker;
153153
extern bool IsBinaryUpgrade;
154154

155-
extern bool ExitOnAnyError;
155+
extern PGDLLIMPORT bool ExitOnAnyError;
156156

157157
extern PGDLLIMPORT char *DataDir;
158158

159159
extern PGDLLIMPORT int NBuffers;
160-
extern int MaxBackends;
161-
extern int MaxConnections;
162-
extern int max_worker_processes;
160+
extern PGDLLIMPORT int MaxBackends;
161+
extern PGDLLIMPORT int MaxConnections;
162+
extern PGDLLIMPORT int max_worker_processes;
163163

164164
extern PGDLLIMPORT int MyProcPid;
165165
extern PGDLLIMPORT pg_time_t MyStartTime;
@@ -238,7 +238,7 @@ extern PGDLLIMPORT int IntervalStyle;
238238
#define MAXTZLEN 10 /* max TZ name len, not counting tr. null */
239239

240240
extern bool enableFsync;
241-
extern bool allowSystemTableMods;
241+
extern PGDLLIMPORT bool allowSystemTableMods;
242242
extern PGDLLIMPORT int work_mem;
243243
extern PGDLLIMPORT int maintenance_work_mem;
244244

src/include/pgtime.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ extern size_t pg_strftime(char *s, size_t max, const char *format,
7070

7171
/* these functions and variables are in pgtz.c */
7272

73-
extern pg_tz *session_timezone;
73+
extern PGDLLIMPORT pg_tz *session_timezone;
7474
extern pg_tz *log_timezone;
7575

7676
extern void pg_timezone_initialize(void);

src/include/postmaster/postmaster.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/* GUC options */
1717
extern bool EnableSSL;
1818
extern int ReservedBackends;
19-
extern int PostPortNumber;
19+
extern PGDLLIMPORT int PostPortNumber;
2020
extern int Unix_socket_permissions;
2121
extern char *Unix_socket_group;
2222
extern char *Unix_socket_directories;
@@ -44,7 +44,7 @@ extern int postmaster_alive_fds[2];
4444
#define POSTMASTER_FD_OWN 1 /* kept open by postmaster only */
4545
#endif
4646

47-
extern const char *progname;
47+
extern PGDLLIMPORT const char *progname;
4848

4949
extern void PostmasterMain(int argc, char *argv[]) __attribute__((noreturn));
5050
extern void ClosePostmasterPorts(bool am_syslogger);

src/include/storage/fd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ typedef int File;
5252

5353

5454
/* GUC parameter */
55-
extern int max_files_per_process;
55+
extern PGDLLIMPORT int max_files_per_process;
5656

5757
/*
5858
* This is private to fd.c, but exported for save/restore_backend_variables()

src/include/storage/proc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ typedef struct PROC_HDR
207207
int startupBufferPinWaitBufId;
208208
} PROC_HDR;
209209

210-
extern PROC_HDR *ProcGlobal;
210+
extern PGDLLIMPORT PROC_HDR *ProcGlobal;
211211

212212
extern PGPROC *PreparedXactProcs;
213213

@@ -223,7 +223,7 @@ extern PGPROC *PreparedXactProcs;
223223

224224

225225
/* configurable options */
226-
extern int DeadlockTimeout;
226+
extern PGDLLIMPORT int DeadlockTimeout;
227227
extern int StatementTimeout;
228228
extern int LockTimeout;
229229
extern bool log_lock_waits;

src/include/tcop/dest.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ struct _DestReceiver
125125
/* Private fields might appear beyond this point... */
126126
};
127127

128-
extern DestReceiver *None_Receiver; /* permanent receiver for DestNone */
128+
extern PGDLLIMPORT DestReceiver *None_Receiver; /* permanent receiver for
129+
* DestNone */
129130

130131
/* The primary destination management functions */
131132

src/include/tcop/tcopprot.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ typedef enum
4444
LOGSTMT_ALL /* log all statements */
4545
} LogStmtLevel;
4646

47-
extern int log_statement;
47+
extern PGDLLIMPORT int log_statement;
4848

4949
extern List *pg_parse_query(const char *query_string);
5050
extern List *pg_analyze_and_rewrite(Node *parsetree, const char *query_string,

src/include/utils/guc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ extern bool default_with_oids;
226226
extern bool SQL_inheritance;
227227

228228
extern int log_min_error_statement;
229-
extern int log_min_messages;
230-
extern int client_min_messages;
229+
extern PGDLLIMPORT int log_min_messages;
230+
extern PGDLLIMPORT int client_min_messages;
231231
extern int log_min_duration_statement;
232232
extern int log_temp_files;
233233

@@ -236,7 +236,7 @@ extern int temp_file_limit;
236236
extern int num_temp_buffers;
237237

238238
extern char *data_directory;
239-
extern char *ConfigFileName;
239+
extern PGDLLIMPORT char *ConfigFileName;
240240
extern char *HbaFileName;
241241
extern char *IdentFileName;
242242
extern char *external_pid_file;

src/include/utils/snapmgr.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
extern bool FirstSnapshotSet;
2222

23-
extern TransactionId TransactionXmin;
24-
extern TransactionId RecentXmin;
25-
extern TransactionId RecentGlobalXmin;
26-
extern TransactionId RecentGlobalDataXmin;
23+
extern PGDLLIMPORT TransactionId TransactionXmin;
24+
extern PGDLLIMPORT TransactionId RecentXmin;
25+
extern PGDLLIMPORT TransactionId RecentGlobalXmin;
26+
extern PGDLLIMPORT TransactionId RecentGlobalDataXmin;
2727

2828
extern Snapshot GetTransactionSnapshot(void);
2929
extern Snapshot GetLatestSnapshot(void);

0 commit comments

Comments
 (0)