Changes to fix/improve the dynamic loading on NT

From: Horak Daniel <horak@mmp.plzen-city.cz>

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index f23180bfd356800e305b7a872e48f773da05a8fe..1a06065da0e8d6a679ffc25b2cf2be96ac9f9627 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -35,7 +35,7 @@
 #include "utils/acl.h"
 #endif
 
-TriggerData *CurrentTriggerData = NULL;
+DLLIMPORT TriggerData *CurrentTriggerData = NULL;
 
 void           RelationBuildTriggers(Relation relation);
 void           FreeTriggerDesc(Relation relation);

diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 2bc52ae209757e5f35bd269c3f8a1a039ef4136c..333f885dd7f614580cb76b113ca1f07c931f8f96 100644 (file)
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -19,9 +19,9 @@ static _SPI_connection *_SPI_current = NULL;
 static int     _SPI_connected = -1;
 static int     _SPI_curid = -1;
 
-uint32         SPI_processed = 0;
-SPITupleTable *SPI_tuptable;
-int                    SPI_result;
+DLLIMPORT uint32       SPI_processed = 0;
+DLLIMPORT SPITupleTable *SPI_tuptable;
+DLLIMPORT int                  SPI_result;
 
 static int     _SPI_execute(char *src, int tcount, _SPI_plan *plan);
 static int     _SPI_pquery(QueryDesc *queryDesc, EState *state, int tcount);

diff --git a/src/include/c.h b/src/include/c.h
index 64e43703662b88c890ab19fed27ae996e0e2914c..242cdca8aab5092f03a91f19391a95297e508b8f 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -57,6 +57,10 @@
 #include <errno.h>
 #endif
 
+#ifdef __CYGWIN32__
+#include <errno.h>
+#endif
+
 /* ----------------------------------------------------------------
  *                             Section 1:      bool, true, false, TRUE, FALSE
  * ----------------------------------------------------------------
@@ -829,6 +833,20 @@ extern char *form(const char *fmt,...);
 #define COPY_CMD               "cp"
 #define SEP_CHAR               '/'
 
+/* defines for dynamic linking on Win32 platform */
+#ifdef __CYGWIN32__
+#if __GNUC__ && ! defined (__declspec)
+#error You need egcs 1.1 or newer for compiling!
+#endif
+#ifdef BUILDING_DLL
+#define DLLIMPORT __declspec (dllexport)
+#else /* not BUILDING_DLL */
+#define DLLIMPORT __declspec (dllimport)
+#endif
+#else /* not CYGWIN */
+#define DLLIMPORT
+#endif
+
 /* Provide prototypes for routines not present in a particular machine's
  * standard C library.  It'd be better to put these in config.h, but
  * in config.h we haven't yet included anything that defines size_t...

diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index f96221f6e6a6b08be41479a1df1a7debb2e5d147..89e13188ea94eade39f50eedb38b0be29b885141 100644 (file)
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -26,7 +26,7 @@ typedef struct TriggerData
        Trigger    *tg_trigger;
 } TriggerData;
 
-extern TriggerData *CurrentTriggerData;
+extern DLLIMPORT TriggerData *CurrentTriggerData;
 
 #define TRIGGER_EVENT_INSERT                   0x00000000
 #define TRIGGER_EVENT_DELETE                   0x00000001

diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index cc72cddc903d1bc5f0c3e90136116964454d6c7e..104bf24aac4e904e63568e1b28b9526458d5c3cb 100644 (file)
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -66,9 +66,9 @@ typedef struct
 #define SPI_OK_UPDATE                  9
 #define SPI_OK_CURSOR                  10
 
-extern uint32 SPI_processed;
-extern SPITupleTable *SPI_tuptable;
-extern int     SPI_result;
+extern DLLIMPORT uint32 SPI_processed;
+extern DLLIMPORT SPITupleTable *SPI_tuptable;
+extern DLLIMPORT int   SPI_result;
 
 extern int     SPI_connect(void);
 extern int     SPI_finish(void);

diff --git a/src/makefiles/Makefile.win b/src/makefiles/Makefile.win
index 44b1369aa81b369fe71ec0f3b9879847453f0ffd..b73f1f2d090c298a2911b9554c68709a0e7bbea0 100644 (file)
--- a/src/makefiles/Makefile.win
+++ b/src/makefiles/Makefile.win
@@ -13,3 +13,8 @@ SHLIB_LINK=$(DLLLIBS)
        $(DLLTOOL) --export-all --output-def $*.def $<
        $(DLLWRAP) -o $@ --def $*.def $< $(SRCDIR)/utils/dllinit.o $(DLLLIBS)
        rm -f $*.def
+
+curdir:=$(shell pwd)
+ifeq ($(findstring backend,$(curdir)), backend)
+CFLAGS+= -DBUILDING_DLL=1
+endif