lin-epics-modules/require
0
0
Fork 0
forked from epics_driver_modules/require
Code Pull Requests Activity

fix for systems where parts of T_A are macro names (e.g. linux)

Browse Source
This commit is contained in:
zimoch
2018-03-06 17:22:35 +01:00
parent 491bba7038
commit af23a6aac4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GNUmakefile
+1 -1
View File
@@ -23,7 +23,7 @@ HEADERS += require.h
USR_INCLUDES_Linux=-idirafter ${EPICS_BASE}/include
# Pass T_A to the code
USR_CFLAGS += -DT_A=${T_A}
USR_CFLAGS += -DT_A='"${T_A}"'
# This should really go into some global WIN32 config file
USR_CFLAGS_WIN32 += /D_WIN32_WINNT=0x501
Makefile
+1 -1
View File
@@ -25,7 +25,7 @@ LIB_LIBS += $(EPICS_BASE_IOC_LIBS)
USR_INCLUDES_Linux=-idirafter ${EPICS_BASE}/include
# Pass T_A to the code
USR_CFLAGS += -DT_A=${T_A}
USR_CFLAGS += -DT_A='"${T_A}"'
# This should really go into some global WIN32 config file
USR_CFLAGS_WIN32 += /D_WIN32_WINNT=0x501
require.c
+2 -2
View File
@@ -229,9 +229,9 @@ const char epicsRelease[] = TOSTR(EPICS_VERSION)"."TOSTR(EPICS_REVISION)"."TOSTR
const char epicsBasetype[] = TOSTR(EPICS_VERSION)"."TOSTR(EPICS_REVISION);
#ifndef T_A
#error T_A not defined: Compile with USR_CFLAGS += -DT_A=${T_A}
#error T_A not defined: Compile with USR_CFLAGS += -DT_A='"${T_A}"'
#endif
const char targetArch[] = TOSTR(T_A);
const char targetArch[] = T_A;
#ifndef OS_CLASS
#error OS_CLASS not defined: Try to compile with USR_CFLAGS += -DOS_CLASS='"${OS_CLASS}"'