From 47ce95a7b98ff06b51f12a7381fc3788dff9961c Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Wed, 20 Jan 2010 18:54:27 +0000
Subject: [PATCH] Now that much of walreceiver has been pulled back into the
 postgres binary, revert PGDLLIMPORT decoration of global variables. I'm not
 sure if there's any real harm from unnecessary PGDLLIMPORTs, but these are
 all internal variables that external modules really shouldn't be messing
 with. ThisTimeLineID still needs PGDLLIMPORT.

---
 src/include/libpq/pqsignal.h          | 6 +++---
 src/include/replication/walreceiver.h | 4 ++--
 src/include/storage/ipc.h             | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h
index 84ac438d15f..db996ebe69f 100644
--- a/src/include/libpq/pqsignal.h
+++ b/src/include/libpq/pqsignal.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/libpq/pqsignal.h,v 1.39 2010/01/16 05:52:29 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/libpq/pqsignal.h,v 1.40 2010/01/20 18:54:27 heikki Exp $
  *
  * NOTES
  *	  This shouldn't be in libpq, but the monitor and some other
@@ -21,13 +21,13 @@
 #include <signal.h>
 
 #ifdef HAVE_SIGPROCMASK
-extern PGDLLIMPORT sigset_t UnBlockSig,
+extern sigset_t UnBlockSig,
 			BlockSig,
 			StartupBlockSig;
 
 #define PG_SETMASK(mask)	sigprocmask(SIG_SETMASK, mask, NULL)
 #else /* not HAVE_SIGPROCMASK */
-extern PGDLLIMPORT int	UnBlockSig,
+extern int	UnBlockSig,
 			BlockSig,
 			StartupBlockSig;
 
diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h
index 57de368d41f..a645d18b5dc 100644
--- a/src/include/replication/walreceiver.h
+++ b/src/include/replication/walreceiver.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 2010-2010, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/replication/walreceiver.h,v 1.3 2010/01/20 09:16:24 heikki Exp $
+ * $PostgreSQL: pgsql/src/include/replication/walreceiver.h,v 1.4 2010/01/20 18:54:27 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -59,7 +59,7 @@ typedef struct
 	slock_t	mutex;		/* locks shared variables shown above */
 } WalRcvData;
 
-extern PGDLLIMPORT WalRcvData *WalRcv;
+extern WalRcvData *WalRcv;
 
 /* libpqwalreceiver hooks */
 typedef bool (*walrcv_connect_type) (char *conninfo, XLogRecPtr startpoint);
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index 3144d645289..e3630553f29 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/ipc.h,v 1.80 2010/01/16 00:04:41 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/storage/ipc.h,v 1.81 2010/01/20 18:54:27 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,7 +62,7 @@ typedef void (*shmem_startup_hook_type) (void);
 
 
 /* ipc.c */
-extern PGDLLIMPORT bool proc_exit_inprogress;
+extern bool proc_exit_inprogress;
 
 extern void proc_exit(int code);
 extern void shmem_exit(int code);
-- 
GitLab