summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2006-10-19 18:32:48 +0000
committerTom Lane2006-10-19 18:32:48 +0000
commit5e0c99ca3bbfa344550567679bfede1f5d8ec41f (patch)
tree90892ea472f194c8455e202cfabdd30d0692e0dd
parent9a468aa47903159b4bc078c28d59859d363986d2 (diff)
Clean up local redeclarations of variables with DLLIMPORT, per report
from Magnus that MSVC complains about this.
-rw-r--r--contrib/adminpack/adminpack.c5
-rw-r--r--contrib/pg_buffercache/pg_buffercache_pages.c5
-rw-r--r--contrib/pg_freespacemap/pg_freespacemap.c7
-rw-r--r--src/backend/catalog/pg_proc.c4
-rw-r--r--src/backend/utils/misc/guc.c5
-rw-r--r--src/include/miscadmin.h6
-rw-r--r--src/include/postmaster/syslogger.h4
-rw-r--r--src/include/storage/buf_internals.h2
-rw-r--r--src/include/storage/freespace.h4
-rw-r--r--src/include/utils/guc.h4
-rw-r--r--src/pl/plperl/plperl.c4
-rw-r--r--src/pl/plpgsql/src/pl_handler.c3
12 files changed, 15 insertions, 38 deletions
diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c
index b30280f493..0a202b456e 100644
--- a/contrib/adminpack/adminpack.c
+++ b/contrib/adminpack/adminpack.c
@@ -22,6 +22,7 @@
#include "miscadmin.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "postmaster/syslogger.h"
#include "storage/fd.h"
#include "utils/datetime.h"
@@ -37,10 +38,6 @@
#endif
#endif
-extern DLLIMPORT char *DataDir;
-extern DLLIMPORT char *Log_directory;
-extern DLLIMPORT char *Log_filename;
-
PG_MODULE_MAGIC;
Datum pg_file_write(PG_FUNCTION_ARGS);
diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c
index 430478f292..2d28034941 100644
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@@ -16,11 +16,6 @@
#define NUM_BUFFERCACHE_PAGES_ELEM 6
-#if defined(WIN32) || defined(__CYGWIN__)
-extern DLLIMPORT BufferDesc *BufferDescriptors;
-extern DLLIMPORT volatile uint32 InterruptHoldoffCount;
-#endif
-
PG_MODULE_MAGIC;
Datum pg_buffercache_pages(PG_FUNCTION_ARGS);
diff --git a/contrib/pg_freespacemap/pg_freespacemap.c b/contrib/pg_freespacemap/pg_freespacemap.c
index 5ec4e6eda7..f17ffbaf20 100644
--- a/contrib/pg_freespacemap/pg_freespacemap.c
+++ b/contrib/pg_freespacemap/pg_freespacemap.c
@@ -17,13 +17,6 @@
#define NUM_FREESPACE_PAGES_ELEM 5
#define NUM_FREESPACE_RELATIONS_ELEM 7
-#if defined(WIN32) || defined(__CYGWIN__)
-/* Need DLLIMPORT for some things that are not so marked in main headers */
-extern DLLIMPORT int MaxFSMPages;
-extern DLLIMPORT int MaxFSMRelations;
-extern DLLIMPORT volatile uint32 InterruptHoldoffCount;
-#endif
-
PG_MODULE_MAGIC;
Datum pg_freespacemap_pages(PG_FUNCTION_ARGS);
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index fb0566aa54..b73da2c420 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -35,10 +35,6 @@
#include "utils/syscache.h"
-/* GUC parameter */
-bool check_function_bodies = true;
-
-
Datum fmgr_internal_validator(PG_FUNCTION_ARGS);
Datum fmgr_c_validator(PG_FUNCTION_ARGS);
Datum fmgr_sql_validator(PG_FUNCTION_ARGS);
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index d3d7232022..4caf254426 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -93,7 +93,6 @@
/* XXX these should appear in other modules' header files */
extern bool Log_disconnections;
-extern bool check_function_bodies;
extern int CommitDelay;
extern int CommitSiblings;
extern char *default_tablespace;
@@ -171,12 +170,12 @@ bool log_statement_stats = false; /* this is sort of all three
* above together */
bool log_btree_build_stats = false;
+bool check_function_bodies = true;
+bool default_with_oids = false;
bool SQL_inheritance = true;
bool Password_encryption = true;
-bool default_with_oids = false;
-
int log_min_error_statement = PANIC;
int log_min_messages = NOTICE;
int client_min_messages = NOTICE;
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index f7b1c91de3..7cc1bed13d 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -70,8 +70,8 @@ extern volatile bool ProcDiePending;
/* these are marked volatile because they are examined by signal handlers: */
extern volatile bool ImmediateInterruptOK;
-extern volatile uint32 InterruptHoldoffCount;
-extern volatile uint32 CritSectionCount;
+extern DLLIMPORT volatile uint32 InterruptHoldoffCount;
+extern DLLIMPORT volatile uint32 CritSectionCount;
/* in tcop/postgres.c */
extern void ProcessInterrupts(void);
@@ -125,7 +125,7 @@ extern bool IsUnderPostmaster;
extern bool ExitOnAnyError;
-extern char *DataDir;
+extern DLLIMPORT char *DataDir;
extern DLLIMPORT int NBuffers;
extern int MaxBackends;
diff --git a/src/include/postmaster/syslogger.h b/src/include/postmaster/syslogger.h
index 5e5eba019c..510a202457 100644
--- a/src/include/postmaster/syslogger.h
+++ b/src/include/postmaster/syslogger.h
@@ -16,8 +16,8 @@
extern bool Redirect_stderr;
extern int Log_RotationAge;
extern int Log_RotationSize;
-extern char *Log_directory;
-extern char *Log_filename;
+extern DLLIMPORT char *Log_directory;
+extern DLLIMPORT 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 6fa60aab8f..b77841dc21 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -162,7 +162,7 @@ typedef struct sbufdesc
/* in buf_init.c */
-extern BufferDesc *BufferDescriptors;
+extern DLLIMPORT BufferDesc *BufferDescriptors;
/* in localbuf.c */
extern BufferDesc *LocalBufferDescriptors;
diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h
index ad7d5e06c7..7ab972c4a0 100644
--- a/src/include/storage/freespace.h
+++ b/src/include/storage/freespace.h
@@ -124,8 +124,8 @@ struct FSMRelation
/* GUC variables */
-extern int MaxFSMRelations;
-extern int MaxFSMPages;
+extern DLLIMPORT int MaxFSMRelations;
+extern DLLIMPORT int MaxFSMPages;
/*
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index e9e4076137..b97797c559 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -115,9 +115,9 @@ extern bool log_executor_stats;
extern bool log_statement_stats;
extern bool log_btree_build_stats;
-extern bool SQL_inheritance;
-
+extern DLLIMPORT bool check_function_bodies;
extern bool default_with_oids;
+extern bool SQL_inheritance;
extern int log_min_error_statement;
extern int log_min_messages;
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index b506512ed2..a8d6523cc0 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -23,13 +23,11 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "parser/parse_type.h"
+#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/typcache.h"
-/* define this before the perl headers get a chance to mangle DLLIMPORT */
-extern DLLIMPORT bool check_function_bodies;
-
/* perl stuff */
#include "plperl.h"
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index 6487826ad0..3b36629db7 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -21,11 +21,10 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "utils/builtins.h"
+#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-extern DLLIMPORT bool check_function_bodies;
-
PG_MODULE_MAGIC;
PLpgSQL_plugin **plugin_ptr = NULL;