From 78fe1595dfa49508389fb5de21c01e26b78f08e6 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Tue, 12 Oct 1999 18:53:10 +0000
Subject: [PATCH] Changes for WIN32 build.

---
 src/libCom/dbmf/dbmf.c            | 3 +--
 src/libCom/env/bldEnvData.pl      | 2 +-
 src/libCom/error/errSymLib.c      | 3 +--
 src/libCom/freeList/freeListLib.c | 3 +--
 src/libCom/gpHash/gpHashLib.c     | 2 +-
 src/libCom/misc/cantProceed.c     | 7 ++++---
 src/libCom/misc/cantProceed.h     | 8 +++++---
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/libCom/dbmf/dbmf.c b/src/libCom/dbmf/dbmf.c
index e985f1bda..35ffd9541 100644
--- a/src/libCom/dbmf/dbmf.c
+++ b/src/libCom/dbmf/dbmf.c
@@ -11,9 +11,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "osiSem.h"
-
 #define epicsExportSharedSymbols
+#include "osiSem.h"
 #include "ellLib.h"
 #include "dbmf.h"
 
diff --git a/src/libCom/env/bldEnvData.pl b/src/libCom/env/bldEnvData.pl
index 6e09c429f..1b25dcd1b 100644
--- a/src/libCom/env/bldEnvData.pl
+++ b/src/libCom/env/bldEnvData.pl
@@ -23,7 +23,7 @@ chdir $config_dir or die "cannot change dir to $config_dir";
 $config_dir=cwd();
 chdir $start_dir;
 
-$SRC      = "../envDefs.h";
+$SRC      = "../../../misc/generic/envDefs.h";
 $env_data = "${config_dir}/CONFIG_ENV";
 $site_data= "${config_dir}/CONFIG_SITE_ENV";
 $out_name = "envData.c";
diff --git a/src/libCom/error/errSymLib.c b/src/libCom/error/errSymLib.c
index 3acc4be30..9e1b2b729 100644
--- a/src/libCom/error/errSymLib.c
+++ b/src/libCom/error/errSymLib.c
@@ -69,11 +69,10 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-
-#include "cantProceed.h"
 #include <errno.h>
 
 #define epicsExportSharedSymbols
+#include "cantProceed.h"
 #include "dbDefs.h"
 #include "errMdef.h"
 #include "errSymTbl.h"
diff --git a/src/libCom/freeList/freeListLib.c b/src/libCom/freeList/freeListLib.c
index e6ed0432a..436343bb9 100644
--- a/src/libCom/freeList/freeListLib.c
+++ b/src/libCom/freeList/freeListLib.c
@@ -57,10 +57,9 @@ DEVELOPMENT CENTER AT ARGONNE NATIONAL LABORATORY (708-252-2000).
 #include <stdlib.h>
 #include <stddef.h>
 
+#define epicsExportSharedSymbols
 #include "cantProceed.h"
 #include "osiSem.h"
-
-#define epicsExportSharedSymbols
 #include "freeList.h"
 #include "adjustment.h"
 
diff --git a/src/libCom/gpHash/gpHashLib.c b/src/libCom/gpHash/gpHashLib.c
index d2f2c28ac..d9106ba6f 100644
--- a/src/libCom/gpHash/gpHashLib.c
+++ b/src/libCom/gpHash/gpHashLib.c
@@ -56,9 +56,9 @@ DEVELOPMENT CENTER AT ARGONNE NATIONAL LABORATORY (708-252-2000).
 #include <stdlib.h>
 #include <stddef.h>
 
+#define epicsExportSharedSymbols
 #include "cantProceed.h"
 #include "osiSem.h"
-#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "ellLib.h"
 #include "epicsPrint.h"
diff --git a/src/libCom/misc/cantProceed.c b/src/libCom/misc/cantProceed.c
index c92fac4fd..ff4151210 100644
--- a/src/libCom/misc/cantProceed.c
+++ b/src/libCom/misc/cantProceed.c
@@ -14,11 +14,12 @@ of this distribution.
 #include <stddef.h>
 #include <stdio.h>
 
+#define epicsExportSharedSymbols
 #include "errlog.h"
 #include "cantProceed.h"
 #include "osiThread.h"
 
-void *callocMustSucceed(size_t count, size_t size, const char *errorMessage)
+epicsShareFunc void * epicsShareAPI callocMustSucceed(size_t count, size_t size, const char *errorMessage)
 {
     void *mem = calloc(count,size);
     if(mem==0) {
@@ -29,7 +30,7 @@ void *callocMustSucceed(size_t count, size_t size, const char *errorMessage)
     return(mem);
 }
 
-void *mallocMustSucceed(size_t size, const char *errorMessage)
+epicsShareFunc void * epicsShareAPI mallocMustSucceed(size_t size, const char *errorMessage)
 {
     void *mem = malloc(size);
     if(mem==0) {
@@ -40,7 +41,7 @@ void *mallocMustSucceed(size_t size, const char *errorMessage)
     return(mem);
 }
 
-void cantProceed(const char *errorMessage)
+epicsShareFunc void epicsShareAPI cantProceed(const char *errorMessage)
 {
     errlogPrintf("fatal error: %s\n",errorMessage);
     threadSuspend(threadGetIdSelf());
diff --git a/src/libCom/misc/cantProceed.h b/src/libCom/misc/cantProceed.h
index ff6373983..1d6290d92 100644
--- a/src/libCom/misc/cantProceed.h
+++ b/src/libCom/misc/cantProceed.h
@@ -5,9 +5,11 @@
 extern "C" {
 #endif
 
-void cantProceed(const char *errorMessage);
-void *callocMustSucceed(size_t count, size_t size, const char *errorMessage);
-void *mallocMustSucceed(size_t size, const char *errorMessage);
+#include "shareLib.h"
+
+epicsShareFunc void epicsShareAPI cantProceed(const char *errorMessage);
+epicsShareFunc void * epicsShareAPI callocMustSucceed(size_t count, size_t size, const char *errorMessage);
+epicsShareFunc void * epicsShareAPI mallocMustSucceed(size_t size, const char *errorMessage);
 #ifdef __cplusplus
 }
 #endif