EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove some old stuff and escape sub-includes from epicsExportSharedSymbols to increase happyness of Windows

Browse Source
This commit is contained in:
zimoch
2018-06-13 10:45:51 +02:00
parent 9d1084cdf8
commit 6d422c4259
1 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/devStream.h
View File

@ -21,14 +21,17 @@
#ifndef devStream_h
#define devStream_h
#include <stdio.h>
#include <sys/types.h>
#if defined(__cplusplus)
extern "C" {
#endif
#define STREAM_MAJOR 2
#define STREAM_MINOR 8
#define STREAM_PATCHLEVEL 0
#if defined(__vxworks) || defined(vxWorks)
#include <vxWorks.h>
#endif
#ifndef OK
#define OK 0
#endif
@ -45,23 +48,22 @@
#define EPICS_3_13
#endif
#if defined(__cplusplus) && defined(EPICS_3_13)
extern "C" {
#ifdef epicsExportSharedSymbols
# define devStream_epicsExportSharedSymbols
# undef epicsExportSharedSymbols
#endif
#include "dbCommon.h"
#include "dbScan.h"
#include "devSup.h"
#include "dbAccess.h"
#include <stdio.h>
#include <sys/types.h>
#if defined(_WIN32) && !defined(ssize_t)
#define ssize_t ptrdiff_t
#ifdef devStream_epicsExportSharedSymbols
# define epicsExportSharedSymbols
#endif
#if defined(__cplusplus) && defined(EPICS_3_13)
}
#if defined(_WIN32)
typedef ptrdiff_t ssize_t;
#endif
typedef const struct format_s {
@ -69,13 +71,8 @@ typedef const struct format_s {
const struct StreamFormat* priv;
} format_t;
#ifdef __cplusplus
extern "C" {
#endif
epicsShareExtern FILE* StreamDebugFile;
extern const char StreamVersion [];
epicsShareExtern const char StreamVersion [];
typedef long (*streamIoFunction) (dbCommon*, format_t*);
@ -92,32 +89,20 @@ ssize_t streamScanfN(dbCommon *record, format_t *format,
void*, size_t maxStringSize);
/* backward compatibility stuff */
#define devStreamIoFunction streamIoFunction
#define devStreamInit streamInit
#define devStreamInitRecord streamInitRecord
#define devStreamReport streamReport
#define devStreamRead streamReadWrite
#define devStreamWrite streamReadWrite
#define devStreamGetIointInfo streamGetIointInfo
#define devStreamPrintf streamPrintf
#define devStreamPrintSep(record) (0)
#define devStreamScanSep (0)
#define devStreamScanf(record, format, value) \
streamScanfN(record, format, value, MAX_STRING_SIZE)
#define streamScanf(record, format, value) \
streamScanfN(record, format, value, MAX_STRING_SIZE)
#define streamRead streamReadWrite
#define streamWrite streamReadWrite
#define streamReport NULL
#ifdef EPICS_3_13
#define epicsExportAddress(a,b) extern int dummy
#else
#include "epicsExport.h"
#endif
#ifdef __cplusplus
}
#endif
#ifndef EPICS_3_13
#include "epicsExport.h"
#else
#define epicsExportAddress(a,b) extern int dummy
#endif
#endif