Skip to content

Commit c572599

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 28f8896 commit c572599

File tree

11 files changed

+22
-21
lines changed

11 files changed

+22
-21
lines changed

src/include/access/twophase.h

+1-1
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* them from the extension first.
2929
*/
3030
extern PGDLLIMPORT bool creating_extension;
31-
extern Oid CurrentExtensionObject;
31+
extern PGDLLIMPORT Oid CurrentExtensionObject;
3232

3333

3434
extern ObjectAddress CreateExtension(ParseState *pstate, CreateExtensionStmt *stmt);

src/include/miscadmin.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ extern PGDLLIMPORT bool IsUnderPostmaster;
150150
extern PGDLLIMPORT bool IsBackgroundWorker;
151151
extern PGDLLIMPORT bool IsBinaryUpgrade;
152152

153-
extern bool ExitOnAnyError;
153+
extern PGDLLIMPORT bool ExitOnAnyError;
154154

155155
extern PGDLLIMPORT char *DataDir;
156156

157157
extern PGDLLIMPORT int NBuffers;
158-
extern int MaxBackends;
159-
extern int MaxConnections;
160-
extern int max_worker_processes;
158+
extern PGDLLIMPORT int MaxBackends;
159+
extern PGDLLIMPORT int MaxConnections;
160+
extern PGDLLIMPORT int max_worker_processes;
161161
extern int max_parallel_workers;
162162

163163
extern PGDLLIMPORT int MyProcPid;
@@ -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

+1-1
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

+2-2
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[]) pg_attribute_noreturn();
5050
extern void ClosePostmasterPorts(bool am_syslogger);

src/include/storage/fd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ typedef int File;
5050

5151

5252
/* GUC parameter */
53-
extern int max_files_per_process;
53+
extern PGDLLIMPORT int max_files_per_process;
5454

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

src/include/storage/proc.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ typedef struct PROC_HDR
269269
int startupBufferPinWaitBufId;
270270
} PROC_HDR;
271271

272-
extern PROC_HDR *ProcGlobal;
272+
extern PGDLLIMPORT PROC_HDR *ProcGlobal;
273273

274274
extern PGPROC *PreparedXactProcs;
275275

@@ -287,7 +287,7 @@ extern PGPROC *PreparedXactProcs;
287287
#define NUM_AUXILIARY_PROCS 4
288288

289289
/* configurable options */
290-
extern int DeadlockTimeout;
290+
extern PGDLLIMPORT int DeadlockTimeout;
291291
extern int StatementTimeout;
292292
extern int LockTimeout;
293293
extern int IdleInTransactionSessionTimeout;

src/include/tcop/dest.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ struct _DestReceiver
129129
/* Private fields might appear beyond this point... */
130130
};
131131

132-
extern DestReceiver *None_Receiver; /* permanent receiver for DestNone */
132+
extern PGDLLIMPORT DestReceiver *None_Receiver; /* permanent receiver for
133+
* DestNone */
133134

134135
/* The primary destination management functions */
135136

src/include/tcop/tcopprot.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ typedef enum
4545
LOGSTMT_ALL /* log all statements */
4646
} LogStmtLevel;
4747

48-
extern int log_statement;
48+
extern PGDLLIMPORT int log_statement;
4949

5050
extern List *pg_parse_query(const char *query_string);
5151
extern List *pg_analyze_and_rewrite(RawStmt *parsetree,

src/include/utils/guc.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ extern bool default_with_oids;
248248
extern bool session_auth_is_superuser;
249249

250250
extern int log_min_error_statement;
251-
extern int log_min_messages;
252-
extern int client_min_messages;
251+
extern PGDLLIMPORT int log_min_messages;
252+
extern PGDLLIMPORT int client_min_messages;
253253
extern int log_min_duration_statement;
254254
extern int log_temp_files;
255255

@@ -258,7 +258,7 @@ extern int temp_file_limit;
258258
extern int num_temp_buffers;
259259

260260
extern char *cluster_name;
261-
extern char *ConfigFileName;
261+
extern PGDLLIMPORT char *ConfigFileName;
262262
extern char *HbaFileName;
263263
extern char *IdentFileName;
264264
extern char *external_pid_file;

src/include/utils/snapmgr.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ extern TimestampTz GetOldSnapshotThresholdTimestamp(void);
5656

5757
extern bool FirstSnapshotSet;
5858

59-
extern TransactionId TransactionXmin;
60-
extern TransactionId RecentXmin;
59+
extern PGDLLIMPORT TransactionId TransactionXmin;
60+
extern PGDLLIMPORT TransactionId RecentXmin;
6161
extern PGDLLIMPORT TransactionId RecentGlobalXmin;
62-
extern TransactionId RecentGlobalDataXmin;
62+
extern PGDLLIMPORT TransactionId RecentGlobalDataXmin;
6363

6464
extern Snapshot GetTransactionSnapshot(void);
6565
extern Snapshot GetLatestSnapshot(void);

0 commit comments

Comments
 (0)