Compiles now under RHEL7

epicsadapter.c

@@ -10,6 +10,7 @@
 #include <assert.h>
 #include <sics.h>
 #include <sicshipadaba.h>
+#undef INLINE /* already defined bz tcl.h, breaks EPICS includes */
 #include <cadef.h>
 #include <epicsMessageQueue.h>
 #include <epicsThread.h>

make_gen

@@ -48,3 +48,7 @@ dgrambroadcast.o: dgrambroadcast.h dgrambroadcast.c
 
 sinq.o: sinq.c sinq.h dgrambroadcast.h
 	$(CC) -I$(TCLINC) $(SINQOPT) -I$(SICSROOT)/sics -g -c sinq.c
+
+EPICSINC=$(EXTRAROOT)/include
+epicsadapter.o: epicsadapter.c
+	$(CC)  $(SINQOPT) -I$(EPICSINC) -I$(EPICSINC)/os/Linux -I$(EPICSINC)/compiler/gcc -I$(SICSROOT)/sics -c -g epicsadapter.c

makefile_linux

@@ -10,12 +10,13 @@
 
 #include $(SICSROOT)/sics/linux_def
 include $(SICSROOT)/sics/sllinux_def
+EXTRAROOT=/afs/psi.ch/project/sinq/rhel7
 
 
 CC       = gcc
-CFLAGS = -I$(HDFROOT)/include -I$(HDFROOT)/include/os/Linux -DHDF4  -DHDF5 $(NI) -I$(TCLINC) -Ihardsup \
+CFLAGS = -I$(EXTRAROOT)/include   -I/usr/include/libbson-1.0 -I/usr/include/libmongoc-1.0 \
+       -DHDF4  -DHDF5 $(NI) -I$(TCLINC) -Ihardsup \
        -I$(SICSROOT)/sics -I..  -I.  -MMD -DCYGNUS -DNONINTF $(DBG)  \
-       -I$(HDFROOT)/include/libbson-1.0  -I$(HDFROOT)/include/libmongoc-1.0 \
        $(DFORTIFY)   -Wall -Wno-unused -Wunused-value -Wno-comment \
        -Wno-switch -Werror