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

This commit is contained in:
2018-05-23 11:55:22 +02:00
parent cbc549f355
commit 3fdca6cf1d
4 changed files with 33 additions and 34 deletions

View File

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

View File

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

View File

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

View File

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