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

for all non-system headers use #include "" instead of include <>

Browse Source
This commit is contained in:
zimoch
2018-05-23 11:55:22 +02:00
parent cbc549f355
commit 3fdca6cf1d
4 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/AsynDriverInterface.cc
View File

@ -27,19 +27,19 @@
#include <wdLib.h> #include <wdLib.h>
#include <sysLib.h> #include <sysLib.h>
#else #else
#include <epicsAssert.h> #include "epicsAssert.h"
#include <epicsTime.h> #include "epicsTime.h"
#include <epicsTimer.h> #include "epicsTimer.h"
extern "C" { extern "C" {
#include <callback.h> #include <callback.h>
} }
#endif #endif
#include <asynDriver.h> #include "asynDriver.h"
#include <asynOctet.h> #include "asynOctet.h"
#include <asynInt32.h> #include "asynInt32.h"
#include <asynUInt32Digital.h> #include "asynUInt32Digital.h"
#include <asynGpibDriver.h> #include "asynGpibDriver.h"
/* How things are implemented: /* How things are implemented:

7
src/ChecksumConverter.cc
View File

@ -20,12 +20,12 @@
#include "StreamFormatConverter.h" #include "StreamFormatConverter.h"
#include "StreamError.h" #include "StreamError.h"
#include <ctype.h>
#if defined(__vxworks) || defined(vxWorks) || defined(_WIN32) || defined(__rtems__) #if defined(__vxworks) || defined(vxWorks) || defined(_WIN32) || defined(__rtems__)
// These systems have no strncasecmp // These systems have no strncasecmp
#include <epicsVersion.h> #include "epicsVersion.h"
#ifdef BASE_VERSION #ifdef BASE_VERSION
// 3.13 // 3.13
#include <ctype.h>
static int strncasecmp(const char *s1, const char *s2, size_t n) static int strncasecmp(const char *s1, const char *s2, size_t n)
{ {
int r=0; int r=0;
@ -33,11 +33,10 @@ static int strncasecmp(const char *s1, const char *s2, size_t n)
return r; return r;
} }
#else #else
#include <epicsString.h> #include "epicsString.h"
#define strncasecmp epicsStrnCaseCmp #define strncasecmp epicsStrnCaseCmp
#endif #endif
#endif #endif
#include <ctype.h>
typedef unsigned int (*checksumFunc)(const unsigned char* data, unsigned int len, unsigned int init); typedef unsigned int (*checksumFunc)(const unsigned char* data, unsigned int len, unsigned int init);

34
src/StreamEpics.cc
View File

@ -21,7 +21,7 @@
#include "StreamCore.h" #include "StreamCore.h"
#include "StreamError.h" #include "StreamError.h"
#include <epicsVersion.h> #include "epicsVersion.h"
#ifdef BASE_VERSION #ifdef BASE_VERSION
#define EPICS_3_13 #define EPICS_3_13
#endif #endif
@ -31,17 +31,17 @@ extern "C" {
#endif #endif
#define epicsAlarmGLOBAL #define epicsAlarmGLOBAL
#include <alarm.h> #include "alarm.h"
#undef epicsAlarmGLOBAL #undef epicsAlarmGLOBAL
#include <ctype.h> #include <ctype.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <dbStaticLib.h> #include "dbStaticLib.h"
#include <drvSup.h> #include "drvSup.h"
#include <recSup.h> #include "recSup.h"
#include <recGbl.h> #include "recGbl.h"
#include <devLib.h> #include "devLib.h"
#include <callback.h> #include "callback.h"
#ifdef EPICS_3_13 #ifdef EPICS_3_13
@ -55,14 +55,14 @@ extern DBBASE *pdbbase;
#else #else
#include <epicsTimer.h> #include "epicsTimer.h"
#include <epicsMutex.h> #include "epicsMutex.h"
#include <epicsEvent.h> #include "epicsEvent.h"
#include <epicsTime.h> #include "epicsTime.h"
#include <epicsThread.h> #include "epicsThread.h"
#include <epicsString.h> #include "epicsString.h"
#include <registryFunction.h> #include "registryFunction.h"
#include <iocsh.h> #include "iocsh.h"
#if EPICS_MODIFICATION<9 #if EPICS_MODIFICATION<9
extern "C" { extern "C" {
@ -73,7 +73,7 @@ epicsShareFunc int epicsShareAPI iocshCmd(const char *command);
} }
#endif #endif
#include <epicsExport.h> #include "epicsExport.h"
#endif #endif

10
src/devStream.h
View File

@ -40,7 +40,7 @@
#define DO_NOT_CONVERT 2 #define DO_NOT_CONVERT 2
#define INIT_RUN (!interruptAccept) #define INIT_RUN (!interruptAccept)
#include <epicsVersion.h> #include "epicsVersion.h"
#ifdef BASE_VERSION #ifdef BASE_VERSION
#define EPICS_3_13 #define EPICS_3_13
#endif #endif
@ -50,10 +50,10 @@ extern "C" {
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <dbCommon.h> #include "dbCommon.h"
#include <dbScan.h> #include "dbScan.h"
#include <devSup.h> #include "devSup.h"
#include <dbAccess.h> #include "dbAccess.h"
#if defined(__cplusplus) && defined(EPICS_3_13) #if defined(__cplusplus) && defined(EPICS_3_13)
} }