From 519b33e4fb90600c068cd13d71c4b583f11d2a6f Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Tue, 29 Jul 2008 21:11:56 +0000
Subject: [PATCH] Changes for shared library build using MinGW compiler on
 win32.

---
 src/dbStatic/dbLexRoutines.c   | 2 +-
 src/dbStatic/dbStaticNoRun.c   | 2 +-
 src/libCom/iocsh/iocsh.cpp     | 2 +-
 src/libCom/iocsh/registry.c    | 2 +-
 src/libCom/misc/shareLib.h     | 2 +-
 src/misc/iocshRegisterCommon.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dbStatic/dbLexRoutines.c b/src/dbStatic/dbLexRoutines.c
index 253e2398c..359be2a3c 100644
--- a/src/dbStatic/dbLexRoutines.c
+++ b/src/dbStatic/dbLexRoutines.c
@@ -20,7 +20,6 @@
 #include "dbmf.h"
 
 #include "dbDefs.h"
-#include "dbFldTypes.h"
 #include "epicsPrint.h"
 #include "errMdef.h"
 #include "ellLib.h"
@@ -33,6 +32,7 @@
 #include "epicsExport.h"
 
 #define epicsExportSharedSymbols
+#include "dbFldTypes.h"
 #include "link.h"
 #include "dbStaticLib.h"
 #include "dbStaticPvt.h"
diff --git a/src/dbStatic/dbStaticNoRun.c b/src/dbStatic/dbStaticNoRun.c
index dcd83aa6e..33e3e452f 100644
--- a/src/dbStatic/dbStaticNoRun.c
+++ b/src/dbStatic/dbStaticNoRun.c
@@ -16,11 +16,11 @@
 #include <math.h>
 
 #include "dbDefs.h"
-#include "dbFldTypes.h"
 #include "epicsPrint.h"
 #include "errMdef.h"
  
 #define epicsExportSharedSymbols
+#include "dbFldTypes.h"
 #include "dbStaticLib.h"
 #include "dbStaticPvt.h"
  
diff --git a/src/libCom/iocsh/iocsh.cpp b/src/libCom/iocsh/iocsh.cpp
index fded2aad0..f1b30c2b4 100644
--- a/src/libCom/iocsh/iocsh.cpp
+++ b/src/libCom/iocsh/iocsh.cpp
@@ -18,6 +18,7 @@
 #include <ctype.h>
 #include <errno.h>
 
+#define epicsExportSharedSymbols
 #include "errlog.h"
 #include "macLib.h"
 #include "epicsStdio.h"
@@ -29,7 +30,6 @@
 #include "registry.h"
 #include "epicsReadline.h"
 #include "cantProceed.h"
-#define epicsExportSharedSymbols
 #include "iocsh.h"
 
 extern "C" {
diff --git a/src/libCom/iocsh/registry.c b/src/libCom/iocsh/registry.c
index e0e9cb0d3..efe584aa3 100644
--- a/src/libCom/iocsh/registry.c
+++ b/src/libCom/iocsh/registry.c
@@ -16,11 +16,11 @@
 #include <string.h>
 #include <stdio.h>
 
+#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "cantProceed.h"
 #include "epicsFindSymbol.h"
 #include "gpHash.h"
-#define epicsExportSharedSymbols
 #include "registry.h"
 
 static void *gphPvt = 0;
diff --git a/src/libCom/misc/shareLib.h b/src/libCom/misc/shareLib.h
index b1044187c..b5882f497 100644
--- a/src/libCom/misc/shareLib.h
+++ b/src/libCom/misc/shareLib.h
@@ -113,7 +113,7 @@
  * Also check for "EPICS_DLL_NO" not defined so that we will not use these
  * keywords if it is an object library build of base under WIN32.
  */
-#if defined(_WIN32) && !defined(__GNUC__) 
+#if (defined(_WIN32) && !defined(__GNUC__))  || defined(_MINGW)
 
 #   if defined(epicsExportSharedSymbols)
 #       if defined(EPICS_DLL_NO) /* this indicates that we are not building a DLL */
diff --git a/src/misc/iocshRegisterCommon.c b/src/misc/iocshRegisterCommon.c
index 2cf35ea55..3e027eb6c 100644
--- a/src/misc/iocshRegisterCommon.c
+++ b/src/misc/iocshRegisterCommon.c
@@ -15,10 +15,10 @@
 #include "dbIocRegister.h"
 #include "dbtoolsIocRegister.h"
 #include "rsrvIocRegister.h"
-#include "miscIocRegister.h"
 #include "libComRegister.h"
 
 #define epicsExportSharedSymbols
+#include "miscIocRegister.h"
 #include "iocshRegisterCommon.h"
 
 void epicsShareAPI iocshRegisterCommon(void)