From 70a6e931fb9969a12ef9e3d3de27f18c77c9bede Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Fri, 30 Jan 2004 01:24:22 +0000 Subject: [PATCH] best not to bracket include with extern "C" --- src/libCom/misc/cantProceed.h | 5 +++-- src/libCom/osi/epicsAssert.h | 4 ++-- src/libCom/osi/epicsThread.h | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/libCom/misc/cantProceed.h b/src/libCom/misc/cantProceed.h index d23f1b018..5004f15bb 100644 --- a/src/libCom/misc/cantProceed.h +++ b/src/libCom/misc/cantProceed.h @@ -12,15 +12,16 @@ #include +#include "shareLib.h" + #ifdef __cplusplus extern "C" { #endif -#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 diff --git a/src/libCom/osi/epicsAssert.h b/src/libCom/osi/epicsAssert.h index 0b048a248..7f5e0adf1 100644 --- a/src/libCom/osi/epicsAssert.h +++ b/src/libCom/osi/epicsAssert.h @@ -18,12 +18,12 @@ #ifndef assertEPICS #define assertEPICS +#include "shareLib.h" + #ifdef __cplusplus extern "C" { #endif -#include "shareLib.h" - #undef assert #ifndef epicsAssertAuthor diff --git a/src/libCom/osi/epicsThread.h b/src/libCom/osi/epicsThread.h index 36c428a7b..f5975a7c4 100644 --- a/src/libCom/osi/epicsThread.h +++ b/src/libCom/osi/epicsThread.h @@ -10,14 +10,14 @@ #ifndef epicsThreadh #define epicsThreadh -#ifdef __cplusplus -extern "C" { -#endif - #include #include "shareLib.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef void (*EPICSTHREADFUNC)(void *parm); static const unsigned epicsThreadPriorityMax = 99;