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

C++ compatibility

Browse Source
This commit is contained in:
Jeff Hill
1997-04-29 06:21:13 +00:00
parent 39c22d2ee0
commit 6fb8477b3a
4 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ca/caerr.h
+12 -2
View File
@@ -213,9 +213,19 @@ READONLY char *ca_message_text[]
};
#endif
#ifdef __STDC__
#ifdef __STDC__
#define CAERR_USE_FUNC_PROTO
#endif
#ifdef __cplusplus
#ifndef CAERR_USE_FUNC_PROTO
#define CAERR_USE_FUNC_PROTO
#endif
#endif
#ifdef CAERR_USE_FUNC_PROTO
READONLY char * epicsShareAPI ca_message(long ca_status);
#else /* __STDC__ */
#else /* CAERR_USE_FUNC_PROTO */
READONLY char *ca_message();
#endif
src/include/caerr.h
+12 -2
View File
@@ -213,9 +213,19 @@ READONLY char *ca_message_text[]
};
#endif
#ifdef __STDC__
#ifdef __STDC__
#define CAERR_USE_FUNC_PROTO
#endif
#ifdef __cplusplus
#ifndef CAERR_USE_FUNC_PROTO
#define CAERR_USE_FUNC_PROTO
#endif
#endif
#ifdef CAERR_USE_FUNC_PROTO
READONLY char * epicsShareAPI ca_message(long ca_status);
#else /* __STDC__ */
#else /* CAERR_USE_FUNC_PROTO */
READONLY char *ca_message();
#endif
src/libCom/errMdef.h
+12 -4
View File
@@ -43,13 +43,21 @@
#ifdef __cplusplus
extern "C" {
#define errMDefUseProtoANSI
#endif
#ifdef __STDC__
#ifdef __STDC__
#ifndef errMDefUseProtoANSI
#define errMDefUseProtoANSI
#endif
#endif
#ifdef errMDefUseProtoANSI
# include <stdarg.h>
#else
# include <varargs.h>
#endif
#include "ellLib.h"
#define RTN_SUCCESS(STATUS) ((STATUS)==0)
@@ -86,7 +94,7 @@ extern "C" {
#define errMessage(S, PM) \
errPrintf(S, __FILE__, __LINE__, PM)
#ifdef __STDC__
#ifdef errMDefUseProtoANSI
int errSymFind(long status, char *name);
int UnixSymFind(long status, char *name, long *value);
int ModSymFind(long status, char *name, long *value);
@@ -100,7 +108,7 @@ void errSymDump();
void tstErrSymFind();
void errInit(void);
#else /*__STDC__*/
#else /* errMDefUseProtoANSI */
void errSymTest();
int errSymFind();
@@ -112,7 +120,7 @@ int errSymbolAdd();
void errPrintf();
void errSymDump();
void tstErrSymFind();
#endif /*__STDC__*/
#endif /* errMDefUseProtoANSI */
extern int errVerbose;
src/libCom/error/errMdef.h
+12 -4
View File
@@ -43,13 +43,21 @@
#ifdef __cplusplus
extern "C" {
#define errMDefUseProtoANSI
#endif
#ifdef __STDC__
#ifdef __STDC__
#ifndef errMDefUseProtoANSI
#define errMDefUseProtoANSI
#endif
#endif
#ifdef errMDefUseProtoANSI
# include <stdarg.h>
#else
# include <varargs.h>
#endif
#include "ellLib.h"
#define RTN_SUCCESS(STATUS) ((STATUS)==0)
@@ -86,7 +94,7 @@ extern "C" {
#define errMessage(S, PM) \
errPrintf(S, __FILE__, __LINE__, PM)
#ifdef __STDC__
#ifdef errMDefUseProtoANSI
int errSymFind(long status, char *name);
int UnixSymFind(long status, char *name, long *value);
int ModSymFind(long status, char *name, long *value);
@@ -100,7 +108,7 @@ void errSymDump();
void tstErrSymFind();
void errInit(void);
#else /*__STDC__*/
#else /* errMDefUseProtoANSI */
void errSymTest();
int errSymFind();
@@ -112,7 +120,7 @@ int errSymbolAdd();
void errPrintf();
void errSymDump();
void tstErrSymFind();
#endif /*__STDC__*/
#endif /* errMDefUseProtoANSI */
extern int errVerbose;