epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

cleaned up the DLL symbol export

Browse Source
This commit is contained in:
Jeff Hill
1998-02-27 01:34:15 +00:00
parent ee11ef0c1b
commit 27c4d0574f
38 changed files with 127 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/adjustment.c
-1
View File
@@ -35,7 +35,6 @@ of this distribution.
* (Appropriate for what we implenment)
*/
#define epicsExportSharedSymbols
#include "shareLib.h"
#include "adjustment.h"
epicsShareFunc size_t epicsShareAPI adjustToWorstCaseAlignment(size_t size)
src/libCom/assertUNIX.c
+4 -1
View File
@@ -27,6 +27,9 @@
* Modification Log:
* -----------------
* $Log$
* Revision 1.10 1998/01/20 21:36:51 mrk
* add dbDefs.h
*
* Revision 1.9 1997/05/01 19:57:09 jhill
* updated dll keywords
*
@@ -55,10 +58,10 @@
#include <string.h>
#include <errno.h>
#define epicsExportSharedSymbols
#include "dbDefs.h"
#include "epicsPrint.h"
#include "epicsVersion.h"
#define epicsExportSharedSymbols
#include "epicsAssert.h"
src/libCom/assertVX.c
+6 -2
View File
@@ -27,6 +27,11 @@
* Modification Log:
* -----------------
* $Log$
* Revision 1.9 1998/02/20 21:45:08 evans
* Made a large number of changes to epicsShareThings in libCom routines
* to get imports and exports straight on WIN32. Not everything is fixed
* at this time.
*
* Revision 1.8 1997/05/01 19:57:10 jhill
* updated dll keywords
*
@@ -56,10 +61,9 @@
#include <vxWorks.h>
#include <taskLib.h>
#define epicsExportSharedSymbols
#include "epicsPrint.h"
#include "epicsVersion.h"
#define epicsExportSharedSymbols
#include "epicsAssert.h"
src/libCom/bucketLib.c
+7 -4
View File
@@ -41,13 +41,16 @@
#include <math.h>
#include <time.h>
#define epicsExportSharedSymbols
#include "epicsAssert.h"
#include "freeList.h" /* bucketLib uses freeListLib inside the DLL */
#ifdef INCbucketLibh
#error bucketLib.h has been included too soon
#endif
#define epicsExportSharedSymbols
/*
* force these to be included before bucketLib.h
* includes them
*/
#include "errMdef.h"
#include "epicsTypes.h"
#include "bucketLib.h"
#ifndef TRUE
src/libCom/bucketLib.h
+5 -11
View File
@@ -33,6 +33,11 @@
* .02 121693 joh added bucketFree()
* .03 052395 joh use std EPICS status
* $Log$
* Revision 1.6 1998/02/20 21:45:10 evans
* Made a large number of changes to epicsShareThings in libCom routines
* to get imports and exports straight on WIN32. Not everything is fixed
* at this time.
*
* Revision 1.5 1997/05/01 19:57:13 jhill
* updated dll keywords
*
@@ -55,21 +60,10 @@
#ifdef __cplusplus
extern "C" {
#endif
/* Defer declaring export functions until appropriate */
#ifdef epicsExportSharedSymbols
#undef epicsExportSharedSymbols
#define restoreExport
#endif
#include "errMdef.h"
#include "epicsTypes.h"
#ifdef restoreExport
#define epicsExportSharedSymbols
#undef restoreExport
#endif
#include "shareLib.h"
typedef unsigned BUCKETID;
src/libCom/bucketLib/bucketLib.c
+7 -4
View File
@@ -41,13 +41,16 @@
#include <math.h>
#include <time.h>
#define epicsExportSharedSymbols
#include "epicsAssert.h"
#include "freeList.h" /* bucketLib uses freeListLib inside the DLL */
#ifdef INCbucketLibh
#error bucketLib.h has been included too soon
#endif
#define epicsExportSharedSymbols
/*
* force these to be included before bucketLib.h
* includes them
*/
#include "errMdef.h"
#include "epicsTypes.h"
#include "bucketLib.h"
#ifndef TRUE
src/libCom/bucketLib/bucketLib.h
+5 -11
View File
@@ -33,6 +33,11 @@
* .02 121693 joh added bucketFree()
* .03 052395 joh use std EPICS status
* $Log$
* Revision 1.6 1998/02/20 21:45:10 evans
* Made a large number of changes to epicsShareThings in libCom routines
* to get imports and exports straight on WIN32. Not everything is fixed
* at this time.
*
* Revision 1.5 1997/05/01 19:57:13 jhill
* updated dll keywords
*
@@ -55,21 +60,10 @@
#ifdef __cplusplus
extern "C" {
#endif
/* Defer declaring export functions until appropriate */
#ifdef epicsExportSharedSymbols
#undef epicsExportSharedSymbols
#define restoreExport
#endif
#include "errMdef.h"
#include "epicsTypes.h"
#ifdef restoreExport
#define epicsExportSharedSymbols
#undef restoreExport
#endif
#include "shareLib.h"
typedef unsigned BUCKETID;
src/libCom/calc/calcPerform.c
+1 -2
View File
@@ -110,10 +110,9 @@
#include <math.h>
#include "dbDefs.h"
#include "postfix.h"
#define epicsExportSharedSymbols
#include "shareLib.h"
#include "postfix.h"
static double local_random();
src/libCom/calc/postfix.c
-3
View File
@@ -100,9 +100,6 @@
#include "dbDefs.h"
#ifdef INCpostfixh
#error postfix.h has been included too soon
#endif
#define epicsExportSharedSymbols
#include "postfix.h"
src/libCom/calc/postfix.h
+6
View File
@@ -39,6 +39,12 @@
#include <shareLib.h>
epicsShareFunc long epicsShareAPI
postfix (char *pinfix, char *ppostfix, short *perror);
epicsShareFunc long epicsShareAPI
calcPerform(double *parg, double *presult, char *post);
/* defines for element table */
#define BAD_EXPRESSION 0
#define FETCH_A 1
src/libCom/calcPerform.c
+1 -2
View File
@@ -110,10 +110,9 @@
#include <math.h>
#include "dbDefs.h"
#include "postfix.h"
#define epicsExportSharedSymbols
#include "shareLib.h"
#include "postfix.h"
static double local_random();
src/libCom/cvtFast.c
+1
View File
@@ -55,6 +55,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <limits.h> /* XPG2/XPG3/POSIX.1/FIPS151-1/ANSI-C */
#define epicsExportSharedSymbols
#include "cvtFast.h"
src/libCom/cvtFast/cvtFast.c
+1
View File
@@ -55,6 +55,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <limits.h> /* XPG2/XPG3/POSIX.1/FIPS151-1/ANSI-C */
#define epicsExportSharedSymbols
#include "cvtFast.h"
src/libCom/ellLib.c
+2 -5
View File
@@ -33,17 +33,14 @@
/* #define DEBUG_DRIVER */
#include <stdlib.h>
#ifdef vxWorks
#include <vxWorks.h>
#endif
#include <stdlib.h>
#include <epicsAssert.h>
#define epicsExportSharedSymbols
#include "epicsAssert.h"
#include "ellLib.h"
#if !defined(NULL)
src/libCom/ellLib/ellLib.c
+2 -5
View File
@@ -33,17 +33,14 @@
/* #define DEBUG_DRIVER */
#include <stdlib.h>
#ifdef vxWorks
#include <vxWorks.h>
#endif
#include <stdlib.h>
#include <epicsAssert.h>
#define epicsExportSharedSymbols
#include "epicsAssert.h"
#include "ellLib.h"
#if !defined(NULL)
src/libCom/env/envSubr.c
Vendored
+1 -1
View File
@@ -82,8 +82,8 @@
#include <errnoLib.h>
#endif
#include "errMdef.h"
#define epicsExportSharedSymbols
#include "errMdef.h"
#include "envDefs.h"
src/libCom/envSubr.c
+1 -1
View File
@@ -82,8 +82,8 @@
#include <errnoLib.h>
#endif
#include "errMdef.h"
#define epicsExportSharedSymbols
#include "errMdef.h"
#include "envDefs.h"
src/libCom/errSymLib.c
+6 -8
View File
@@ -70,11 +70,6 @@
#include <errno.h>
#include <stdlib.h>
#include "ellLib.h"
#include "dbDefs.h"
#include "errMdef.h"
#include "errSymTbl.h"
#ifdef vxWorks
#include <vxWorks.h>
#include <taskLib.h>
@@ -82,13 +77,16 @@
#include <symLib.h>
#include <errnoLib.h>
#define epicsExportSharedSymbols
#include "shareLib.h"
extern SYMTAB_ID statSymTbl;
#endif
#define epicsExportSharedSymbols
#include "dbDefs.h"
#include "errMdef.h"
#include "errSymTbl.h"
#ifdef __STDC__
static unsigned short errhash(long errNum);
#else /*__STDC__*/
src/libCom/errlog.h
+11 -4
View File
@@ -13,9 +13,9 @@ of this distribution.
#ifndef INCerrlogh
#define INCerrlogh
#include <stdarg.h>
#include <shareLib.h>
#include "shareLib.h"
#ifdef __cplusplus
extern "C" {
@@ -28,6 +28,11 @@ extern "C" {
#endif
#endif
#ifdef epicsPrintUseProtoANSI
# include <stdarg.h>
#else
# include <varargs.h>
#endif
/* define errMessage with a macro so we can print the file and line number*/
#define errMessage(S, PM) \
@@ -38,9 +43,11 @@ extern "C" {
typedef void(*errlogListener) (const char *message);
typedef enum {errlogInfo,errlogMinor,errlogMajor,errlogFatal} errlogSevEnum;
epicsShareExtern char * errlogSevEnumString[];
#ifdef epicsExportSharedSymbols
#ifdef ERRLOG_INIT
epicsShareDef char * errlogSevEnumString[] = {"info","minor","major","fatal"};
#else
epicsShareExtern char * errlogSevEnumString[];
#endif
#ifdef epicsPrintUseProtoANSI
src/libCom/errlogUNIX.c
+2 -18
View File
@@ -41,30 +41,14 @@
#include <string.h>
#include <errno.h>
#define ERRLOG_INIT
#define epicsExportSharedSymbols
#include "epicsAssert.h"
/* errlog.h is included in errMdef.h for historical reasons
* We want to include errMdef.h here but not errlog.h
* (If we include it here, the epicsShareThings will be declared as import)
* Define INCerrlog to keep it from being included
*/
#define INCerrlogh
#include "errMdef.h"
#include "error.h"
/* Up to now epicsShareThings have been declared as imports
* (Appropriate for other stuff)
* After setting the following they will be declared as exports
* (Appropriate for what we implenment)
*/
#define epicsExportSharedSymbols
/* Include errlog.h here (by undefining INCerrlogh) to:
* (1) Make the declarations be export
* (2) Allocate storage for errlogSevEnumString[]
*/
#undef INCerrlogh
#include "errlog.h"
static int sevToLog=0;
epicsShareFunc int epicsShareAPIV errlogPrintf(const char *pformat, ...)
{
src/libCom/errlogVX.c
+1 -18
View File
@@ -27,29 +27,12 @@ of this distribution.
#include <errnoLib.h>
#include <logLib.h>
#define ERRLOG_INIT
#include "epicsAssert.h"
/* errlog.h is included in errMdef.h for historical reasons
* We want to include errMdef.h here but not errlog.h
* (If we include it here, the epicsShareThings will be declared as import)
* (Is only a problem for WIN32 but done here for consistency)
* Define INCerrlog to keep it from being included
*/
#define INCerrlogh
#include "errMdef.h"
#include "error.h"
#include "ellLib.h"
#include "task_params.h"
/* Up to now epicsShareThings have been declared as imports
* (Appropriate for other stuff)
* After setting the following they will be declared as exports
* (Appropriate for what we implenment)
*/
#define epicsExportSharedSymbols
/* Include errlog.h here (by undefining INCerrlogh) to:
* (1) Make the declarations be export
* (2) Allocate storage for errlogSevEnumString[]
*/
#undef INCerrlogh
#include "errlog.h"
src/libCom/error/errSymLib.c
+6 -8
View File
@@ -70,11 +70,6 @@
#include <errno.h>
#include <stdlib.h>
#include "ellLib.h"
#include "dbDefs.h"
#include "errMdef.h"
#include "errSymTbl.h"
#ifdef vxWorks
#include <vxWorks.h>
#include <taskLib.h>
@@ -82,13 +77,16 @@
#include <symLib.h>
#include <errnoLib.h>
#define epicsExportSharedSymbols
#include "shareLib.h"
extern SYMTAB_ID statSymTbl;
#endif
#define epicsExportSharedSymbols
#include "dbDefs.h"
#include "errMdef.h"
#include "errSymTbl.h"
#ifdef __STDC__
static unsigned short errhash(long errNum);
#else /*__STDC__*/
src/libCom/error/errlog.c
+1 -18
View File
@@ -27,29 +27,12 @@ of this distribution.
#include <errnoLib.h>
#include <logLib.h>
#define ERRLOG_INIT
#include "epicsAssert.h"
/* errlog.h is included in errMdef.h for historical reasons
* We want to include errMdef.h here but not errlog.h
* (If we include it here, the epicsShareThings will be declared as import)
* (Is only a problem for WIN32 but done here for consistency)
* Define INCerrlog to keep it from being included
*/
#define INCerrlogh
#include "errMdef.h"
#include "error.h"
#include "ellLib.h"
#include "task_params.h"
/* Up to now epicsShareThings have been declared as imports
* (Appropriate for other stuff)
* After setting the following they will be declared as exports
* (Appropriate for what we implenment)
*/
#define epicsExportSharedSymbols
/* Include errlog.h here (by undefining INCerrlogh) to:
* (1) Make the declarations be export
* (2) Allocate storage for errlogSevEnumString[]
*/
#undef INCerrlogh
#include "errlog.h"
src/libCom/error/errlog.h
+11 -4
View File
@@ -13,9 +13,9 @@ of this distribution.
#ifndef INCerrlogh
#define INCerrlogh
#include <stdarg.h>
#include <shareLib.h>
#include "shareLib.h"
#ifdef __cplusplus
extern "C" {
@@ -28,6 +28,11 @@ extern "C" {
#endif
#endif
#ifdef epicsPrintUseProtoANSI
# include <stdarg.h>
#else
# include <varargs.h>
#endif
/* define errMessage with a macro so we can print the file and line number*/
#define errMessage(S, PM) \
@@ -38,9 +43,11 @@ extern "C" {
typedef void(*errlogListener) (const char *message);
typedef enum {errlogInfo,errlogMinor,errlogMajor,errlogFatal} errlogSevEnum;
epicsShareExtern char * errlogSevEnumString[];
#ifdef epicsExportSharedSymbols
#ifdef ERRLOG_INIT
epicsShareDef char * errlogSevEnumString[] = {"info","minor","major","fatal"};
#else
epicsShareExtern char * errlogSevEnumString[];
#endif
#ifdef epicsPrintUseProtoANSI
src/libCom/fdmgr.c
+6 -5
View File
@@ -71,6 +71,11 @@
* we eliminate delete ambiguity (chance of the same
* being reused).
* $Log$
* Revision 1.28 1998/02/20 21:45:14 evans
* Made a large number of changes to epicsShareThings in libCom routines
* to get imports and exports straight on WIN32. Not everything is fixed
* at this time.
*
* Revision 1.27 1998/02/05 21:08:52 jhill
* use SOCK error defs and use priority inheritance mutex
*
@@ -129,13 +134,9 @@ static char *pSccsId = "@(#) $Id$";
#include <semLib.h>
#endif
#define epicsExportSharedSymbols
#include "epicsAssert.h"
#include "epicsTypes.h"
#ifdef includeFdmgrH
#error fdmgr.h has been included too soon
#endif
#define epicsExportSharedSymbols
#include "fdmgr.h"
#if 0
src/libCom/fdmgr.h
-11
View File
@@ -44,22 +44,11 @@
#ifdef __cplusplus
extern "C" {
#endif
/* Defer declaring export functions until appropriate */
#ifdef epicsExportSharedSymbols
#undef epicsExportSharedSymbols
#define restoreExport
#endif
#include "ellLib.h"
#include "bucketLib.h"
#include "osiSock.h"
#ifdef restoreExport
#define epicsExportSharedSymbols
#undef restoreExport
#endif
#include "shareLib.h"
enum fdi_type {fdi_read, fdi_write, fdi_excp};
src/libCom/fdmgr/fdmgr.h
-11
View File
@@ -44,22 +44,11 @@
#ifdef __cplusplus
extern "C" {
#endif
/* Defer declaring export functions until appropriate */
#ifdef epicsExportSharedSymbols
#undef epicsExportSharedSymbols
#define restoreExport
#endif
#include "ellLib.h"
#include "bucketLib.h"
#include "osiSock.h"
#ifdef restoreExport
#define epicsExportSharedSymbols
#undef restoreExport
#endif
#include "shareLib.h"
enum fdi_type {fdi_read, fdi_write, fdi_excp};
src/libCom/gpHash/gpHashLib.c
+1 -2
View File
@@ -60,11 +60,10 @@ DEVELOPMENT CENTER AT ARGONNE NATIONAL LABORATORY (708-252-2000).
#include <stdlib.h>
#include <stddef.h>
#define epicsExportSharedSymbols
#include "dbDefs.h"
#include "ellLib.h"
#include "epicsPrint.h"
#define epicsExportSharedSymbols
#include "gpHash.h"
typedef struct gphPvt {
src/libCom/gpHashLib.c
+1 -2
View File
@@ -60,11 +60,10 @@ DEVELOPMENT CENTER AT ARGONNE NATIONAL LABORATORY (708-252-2000).
#include <stdlib.h>
#include <stddef.h>
#define epicsExportSharedSymbols
#include "dbDefs.h"
#include "ellLib.h"
#include "epicsPrint.h"
#define epicsExportSharedSymbols
#include "gpHash.h"
typedef struct gphPvt {
src/libCom/macCore.c
+6 -2
View File
@@ -37,9 +37,8 @@
#include <stdlib.h>
#include <string.h>
#include "dbmf.h"
#define epicsExportSharedSymbols
#include "dbmf.h"
#include "macLib.h"
/*
@@ -756,6 +755,11 @@ char *Strdup( char *string )
}
/* $Log$
* Revision 1.7 1998/02/20 21:45:16 evans
* Made a large number of changes to epicsShareThings in libCom routines
* to get imports and exports straight on WIN32. Not everything is fixed
* at this time.
*
* Revision 1.6 1997/06/05 18:28:48 mrk
* Allow message about referenced but undefined to be suppressed
*
src/libCom/macLib.h
+5 -11
View File
@@ -5,23 +5,12 @@
* William Lupton, W. M. Keck Observatory
*/
/* Defer declaring export functions until appropriate */
#ifdef epicsExportSharedSymbols
#undef epicsExportSharedSymbols
#define restoreExport
#endif
/*
* EPICS include files needed by this file
*/
#include "ellLib.h"
#include "epicsPrint.h"
#include "errMdef.h"
#ifdef restoreExport
#define epicsExportSharedSymbols
#undef restoreExport
#endif
#include "shareLib.h"
/*
@@ -213,6 +202,11 @@ epicsShareAPI macInstallMacros(
);
/* $Log$
* Revision 1.5 1998/02/20 21:45:17 evans
* Made a large number of changes to epicsShareThings in libCom routines
* to get imports and exports straight on WIN32. Not everything is fixed
* at this time.
*
* Revision 1.4 1997/06/05 18:28:49 mrk
* Allow message about referenced but undefined to be suppressed
*
src/libCom/macLib/macCore.c
+6 -2
View File
@@ -37,9 +37,8 @@
#include <stdlib.h>
#include <string.h>
#include "dbmf.h"
#define epicsExportSharedSymbols
#include "dbmf.h"
#include "macLib.h"
/*
@@ -756,6 +755,11 @@ char *Strdup( char *string )
}
/* $Log$
* Revision 1.7 1998/02/20 21:45:16 evans
* Made a large number of changes to epicsShareThings in libCom routines
* to get imports and exports straight on WIN32. Not everything is fixed
* at this time.
*
* Revision 1.6 1997/06/05 18:28:48 mrk
* Allow message about referenced but undefined to be suppressed
*
src/libCom/macLib/macLib.h
+5 -11
View File
@@ -5,23 +5,12 @@
* William Lupton, W. M. Keck Observatory
*/
/* Defer declaring export functions until appropriate */
#ifdef epicsExportSharedSymbols
#undef epicsExportSharedSymbols
#define restoreExport
#endif
/*
* EPICS include files needed by this file
*/
#include "ellLib.h"
#include "epicsPrint.h"
#include "errMdef.h"
#ifdef restoreExport
#define epicsExportSharedSymbols
#undef restoreExport
#endif
#include "shareLib.h"
/*
@@ -213,6 +202,11 @@ epicsShareAPI macInstallMacros(
);
/* $Log$
* Revision 1.5 1998/02/20 21:45:17 evans
* Made a large number of changes to epicsShareThings in libCom routines
* to get imports and exports straight on WIN32. Not everything is fixed
* at this time.
*
* Revision 1.4 1997/06/05 18:28:49 mrk
* Allow message about referenced but undefined to be suppressed
*
src/libCom/misc/adjustment.c
-1
View File
@@ -35,7 +35,6 @@ of this distribution.
* (Appropriate for what we implenment)
*/
#define epicsExportSharedSymbols
#include "shareLib.h"
#include "adjustment.h"
epicsShareFunc size_t epicsShareAPI adjustToWorstCaseAlignment(size_t size)
src/libCom/postfix.c
-3
View File
@@ -100,9 +100,6 @@
#include "dbDefs.h"
#ifdef INCpostfixh
#error postfix.h has been included too soon
#endif
#define epicsExportSharedSymbols
#include "postfix.h"
src/libCom/postfix.h
+6
View File
@@ -39,6 +39,12 @@
#include <shareLib.h>
epicsShareFunc long epicsShareAPI
postfix (char *pinfix, char *ppostfix, short *perror);
epicsShareFunc long epicsShareAPI
calcPerform(double *parg, double *presult, char *post);
/* defines for element table */
#define BAD_EXPRESSION 0
#define FETCH_A 1
src/libCom/tsDefs.h
+1 -13
View File
@@ -54,21 +54,10 @@
#ifdef __cplusplus
extern "C" {
#endif
/* Defer declaring export functions until appropriate */
#ifdef epicsExportSharedSymbols
#undef epicsExportSharedSymbols
#define restoreExport
#endif
#include "epicsTypes.h"
#include "errMdef.h" /* get M_ts for this subsystem's `number' */
#ifdef restoreExport
#define epicsExportSharedSymbols
#undef restoreExport
#endif
#include "shareLib.h"
/*---------------------------------------------------------------------------
@@ -255,8 +244,7 @@ epicsShareFunc long epicsShareAPI tsTimeTextToStamp();
(glTsStatText[TsStatusToIndex(status)])
epicsShareExtern char *glTsStatText[7];
#ifdef epicsExportSharedSymbols
/* #error epicsExportSharedSymbols is defined in tsDefs.h */
#ifdef createTSSubrGlobals
epicsShareDef char *glTsStatText[] = {
/* S_ts_OK */ "success",
/* S_ts_sysTimeError */ "error getting system time",
src/libCom/tsSubr.c
+2 -3
View File
@@ -134,11 +134,10 @@
# include <sys/time.h>
#endif
#define epicsExportSharedSymbols
#include "epicsAssert.h"
#include "envDefs.h"
#define epicsExportSharedSymbols
/* The instance of glTsStatText[] will be defined */
#define createTSSubrGlobals
#include "tsDefs.h"