From 42adbd20c8bbdec26f0ac1475dac3dbe64f37440 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Wed, 30 Apr 1997 19:11:22 +0000 Subject: [PATCH] move errhash defs. Add modules to Makefiles --- src/libCom/Makefile.Host | 2 ++ src/libCom/Makefile.Vx | 3 ++- src/libCom/errSymLib.c | 6 ++++++ src/libCom/errSymTbl.h | 6 ------ src/libCom/error/errSymLib.c | 6 ++++++ src/libCom/error/errSymTbl.h | 6 ------ 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/libCom/Makefile.Host b/src/libCom/Makefile.Host index 8505fdd60..a7ac432a2 100644 --- a/src/libCom/Makefile.Host +++ b/src/libCom/Makefile.Host @@ -31,6 +31,7 @@ INC += macLib.h INC += impLib.h INC += sigPipeIgnore.h INC += dbmf.h +INC += epicsString.h # For WIN32 we supply getopt as part of libCom: INC_WIN32 := getopt.h @@ -65,6 +66,7 @@ LIBSRCS += macUtil.c LIBSRCS += sigPipeIgnore.c LIBSRCS += dbmf.c LIBSRCS += ipAddrToA.c +LIBSRCS += epicsString.c # # if CPLUSPLUS isnt empty then include C++ src codes diff --git a/src/libCom/Makefile.Vx b/src/libCom/Makefile.Vx index cf64db716..cf51fceb7 100644 --- a/src/libCom/Makefile.Vx +++ b/src/libCom/Makefile.Vx @@ -1,6 +1,5 @@ TOP = ../../.. include $(TOP)/config/CONFIG_BASE -USR_CFLAGS += -Wall -pedantic USR_INCLUDES = -I$(TOP)/src/include/os/vxWorks @@ -32,6 +31,7 @@ SRCS.c += ../os/vxWorks/ipAddrToA.c SRCS.c += ../os/vxWorks/sigPipeIgnore.c SRCS.c += ../impLib.c SRCS.c += ../dbmf.c +SRCS.c += ../epicsString.c LIBOBJS += calcPerform.o LIBOBJS += cvtFast.o @@ -58,6 +58,7 @@ LIBOBJS += ipAddrToA.o LIBOBJS += sigPipeIgnore.o LIBOBJS += impLib.o LIBOBJS += dbmf.o +LIBOBJS += epicsString.o LIBNAME = libCom diff --git a/src/libCom/errSymLib.c b/src/libCom/errSymLib.c index 7e48cd675..ce19b23a0 100644 --- a/src/libCom/errSymLib.c +++ b/src/libCom/errSymLib.c @@ -86,6 +86,12 @@ extern SYMTAB_ID statSymTbl; #endif +#ifdef __STDC__ +static unsigned short errhash(long errNum); +#else /*__STDC__*/ +static unsigned short errhash(); +#endif /*__STDC__*/ + #ifdef vxWorks #define MYERRNO (errnoGet()&0xffff) diff --git a/src/libCom/errSymTbl.h b/src/libCom/errSymTbl.h index 21a29eda9..8c219fe29 100644 --- a/src/libCom/errSymTbl.h +++ b/src/libCom/errSymTbl.h @@ -21,10 +21,4 @@ typedef struct /* ERRSYMTAB - symbol table */ typedef ERRSYMTAB *ERRSYMTAB_ID; -#ifdef __STDC__ -static unsigned short errhash(long errNum); -#else /*__STDC__*/ -static unsigned short errhash(); -#endif /*__STDC__*/ - #endif /* INCerrSymTblh */ diff --git a/src/libCom/error/errSymLib.c b/src/libCom/error/errSymLib.c index 7e48cd675..ce19b23a0 100644 --- a/src/libCom/error/errSymLib.c +++ b/src/libCom/error/errSymLib.c @@ -86,6 +86,12 @@ extern SYMTAB_ID statSymTbl; #endif +#ifdef __STDC__ +static unsigned short errhash(long errNum); +#else /*__STDC__*/ +static unsigned short errhash(); +#endif /*__STDC__*/ + #ifdef vxWorks #define MYERRNO (errnoGet()&0xffff) diff --git a/src/libCom/error/errSymTbl.h b/src/libCom/error/errSymTbl.h index 21a29eda9..8c219fe29 100644 --- a/src/libCom/error/errSymTbl.h +++ b/src/libCom/error/errSymTbl.h @@ -21,10 +21,4 @@ typedef struct /* ERRSYMTAB - symbol table */ typedef ERRSYMTAB *ERRSYMTAB_ID; -#ifdef __STDC__ -static unsigned short errhash(long errNum); -#else /*__STDC__*/ -static unsigned short errhash(); -#endif /*__STDC__*/ - #endif /* INCerrSymTblh */