VMS changes and traditional C changes
This commit is contained in:
@@ -145,6 +145,7 @@ typedef struct ca_access_rights{
|
||||
|
||||
|
||||
/* Format for the arguments to user connection handlers */
|
||||
struct channel_in_use;
|
||||
struct connection_handler_args{
|
||||
struct channel_in_use *chid; /* Channel id */
|
||||
long op; /* External codes for CA op */
|
||||
@@ -941,7 +942,11 @@ void * /* PVALUE R pointer to new channel value of type */
|
||||
/*
|
||||
* print status of a sync group
|
||||
*/
|
||||
#ifdef CAC_FUNC_PROTO
|
||||
int epicsShareAPI ca_sg_stat(CA_SYNC_GID gid);
|
||||
#else /*CAC_FUNC_PROTO*/
|
||||
int epicsShareAPI ca_sg_stat();
|
||||
#endif /*CAC_FUNC_PROTO*/
|
||||
|
||||
/*
|
||||
* CA_MODIFY_USER_NAME()
|
||||
|
||||
@@ -48,6 +48,7 @@
|
||||
#define INCLcaerrh
|
||||
|
||||
#include <shareLib.h>
|
||||
#include <epicsTypes.h>
|
||||
|
||||
#ifndef HDRVERSIONID
|
||||
# define HDRVERSIONID(NAME,VERS)
|
||||
@@ -153,9 +154,9 @@ HDRVERSIONID(caerrh, "@(#) $Id$")
|
||||
|
||||
|
||||
#ifndef CA_ERROR_GLBLSOURCE
|
||||
epicsShareExtern const char *ca_message_text[];
|
||||
epicsShareExtern READONLY char *ca_message_text[];
|
||||
#else
|
||||
const char *ca_message_text[]
|
||||
READONLY char *ca_message_text[]
|
||||
=
|
||||
{
|
||||
"Normal successful completion",
|
||||
@@ -212,6 +213,10 @@ const char *ca_message_text[]
|
||||
};
|
||||
#endif
|
||||
|
||||
const char *ca_message(long ca_status);
|
||||
#ifdef __STDC__
|
||||
READONLY char *ca_message(long ca_status);
|
||||
#else /* __STDC__ */
|
||||
READONLY char *ca_message();
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -145,6 +145,7 @@ typedef struct ca_access_rights{
|
||||
|
||||
|
||||
/* Format for the arguments to user connection handlers */
|
||||
struct channel_in_use;
|
||||
struct connection_handler_args{
|
||||
struct channel_in_use *chid; /* Channel id */
|
||||
long op; /* External codes for CA op */
|
||||
@@ -941,7 +942,11 @@ void * /* PVALUE R pointer to new channel value of type */
|
||||
/*
|
||||
* print status of a sync group
|
||||
*/
|
||||
#ifdef CAC_FUNC_PROTO
|
||||
int epicsShareAPI ca_sg_stat(CA_SYNC_GID gid);
|
||||
#else /*CAC_FUNC_PROTO*/
|
||||
int epicsShareAPI ca_sg_stat();
|
||||
#endif /*CAC_FUNC_PROTO*/
|
||||
|
||||
/*
|
||||
* CA_MODIFY_USER_NAME()
|
||||
|
||||
@@ -48,6 +48,7 @@
|
||||
#define INCLcaerrh
|
||||
|
||||
#include <shareLib.h>
|
||||
#include <epicsTypes.h>
|
||||
|
||||
#ifndef HDRVERSIONID
|
||||
# define HDRVERSIONID(NAME,VERS)
|
||||
@@ -153,9 +154,9 @@ HDRVERSIONID(caerrh, "@(#) $Id$")
|
||||
|
||||
|
||||
#ifndef CA_ERROR_GLBLSOURCE
|
||||
epicsShareExtern const char *ca_message_text[];
|
||||
epicsShareExtern READONLY char *ca_message_text[];
|
||||
#else
|
||||
const char *ca_message_text[]
|
||||
READONLY char *ca_message_text[]
|
||||
=
|
||||
{
|
||||
"Normal successful completion",
|
||||
@@ -212,6 +213,10 @@ const char *ca_message_text[]
|
||||
};
|
||||
#endif
|
||||
|
||||
const char *ca_message(long ca_status);
|
||||
#ifdef __STDC__
|
||||
READONLY char *ca_message(long ca_status);
|
||||
#else /* __STDC__ */
|
||||
READONLY char *ca_message();
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user