From 2872f190e89b28493e1085522e824af01309f0fc Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 29 Aug 2002 15:02:17 +0000
Subject: [PATCH] dont include shareLib.h more than necessary

---
 src/ca/db_access.h      |  4 +---
 src/ca/nciu.h           | 11 ++++-------
 src/ca/oldAccess.h      |  7 ++-----
 src/ca/repeaterClient.h | 11 ++++-------
 src/ca/searchTimer.h    |  3 +--
 src/ca/syncGroup.h      | 11 ++++-------
 src/ca/udpiiu.h         |  4 +---
 7 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/src/ca/db_access.h b/src/ca/db_access.h
index dd0021fb6..37d98c51c 100644
--- a/src/ca/db_access.h
+++ b/src/ca/db_access.h
@@ -24,16 +24,14 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "epicsTypes.h"
 #include "epicsTime.h"
 
 #ifdef INCLdb_accessh_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/ca/nciu.h b/src/ca/nciu.h
index 1577bf6c5..9bbd7f707 100644
--- a/src/ca/nciu.h
+++ b/src/ca/nciu.h
@@ -27,12 +27,10 @@
 #define nciuh
 
 #ifdef epicsExportSharedSymbols
-#define nciuh_restore_epicsExportSharedSymbols
-#undef epicsExportSharedSymbols
+#   define nciuh_restore_epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "resourceLib.h"
 #include "tsDLList.h"
 #include "tsFreeList.h"
@@ -40,11 +38,10 @@
 #include "epicsSingleton.h"
 
 #ifdef nciuh_restore_epicsExportSharedSymbols
-#define epicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
-
 #define CA_MINOR_PROTOCOL_REVISION 11
 #include "caProto.h"
 
diff --git a/src/ca/oldAccess.h b/src/ca/oldAccess.h
index 00b33e9e1..3f8956913 100644
--- a/src/ca/oldAccess.h
+++ b/src/ca/oldAccess.h
@@ -29,19 +29,16 @@
 
 #ifdef epicsExportSharedSymbols
 #   define oldAccessh_restore_epicsExportSharedSymbols
-#undef epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "tsFreeList.h"
 
 #ifdef oldAccessh_restore_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
-
 #include "cac.h"
 #include "cacIO.h"
 #include "cadef.h"
diff --git a/src/ca/repeaterClient.h b/src/ca/repeaterClient.h
index 590b1697b..c5309d05e 100644
--- a/src/ca/repeaterClient.h
+++ b/src/ca/repeaterClient.h
@@ -28,21 +28,18 @@
 #define repeaterClienth
 
 #ifdef epicsExportSharedSymbols
-#define repeaterClienth_restore_epicsExportSharedSymbols
-#undef epicsExportSharedSymbols
+#   define repeaterClienth_restore_epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "tsDLList.h"
 #include "epicsSingleton.h"
 
 #ifdef repeaterClienth_restore_epicsExportSharedSymbols
-#define epicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
-
 union osiSockAddr;
 
 /*
diff --git a/src/ca/searchTimer.h b/src/ca/searchTimer.h
index b5326761a..9ca33f490 100644
--- a/src/ca/searchTimer.h
+++ b/src/ca/searchTimer.h
@@ -32,13 +32,12 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "epicsMutex.h"
 #include "epicsTimer.h"
 
 #ifdef searchTimerh_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
 #include "caProto.h"
diff --git a/src/ca/syncGroup.h b/src/ca/syncGroup.h
index 7209ee03d..969aa18df 100644
--- a/src/ca/syncGroup.h
+++ b/src/ca/syncGroup.h
@@ -27,12 +27,10 @@
 #define syncGrouph
 
 #ifdef epicsExportSharedSymbols
-#define syncGrouph_restore_epicsExportSharedSymbols
-#undef epicsExportSharedSymbols
+#   define syncGrouph_restore_epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "epicsSingleton.h"
@@ -40,11 +38,10 @@
 #include "epicsEvent.h"
 
 #ifdef syncGrouph_restore_epicsExportSharedSymbols
-#define epicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
-
 #include "cadef.h"
 #include "cacIO.h"
 
diff --git a/src/ca/udpiiu.h b/src/ca/udpiiu.h
index 874ef4a4b..31d7f6c4b 100644
--- a/src/ca/udpiiu.h
+++ b/src/ca/udpiiu.h
@@ -32,8 +32,6 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "osiSock.h"
 #include "epicsThread.h"
 #include "epicsMemory.h"
@@ -41,9 +39,9 @@
 
 #ifdef udpiiuh_accessh_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
 
 #include "netiiu.h"