move errhash defs. Add modules to Makefiles
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user