Remove dependency of the include gpib/ib.h

src/drivers/global/Gpib.cpp

@@ -29,7 +29,7 @@ const int32 Gpib::EOS_ON = 1; // seconds
 const int32 Gpib::EOS_OFF = 0; // seconds
 const int32 Gpib::EOT_ON = 1; // seconds
 const int32 Gpib::EOT_OFF = 0; // seconds
-const int32 Gpib::DEFAULT_TIMEOUT = T3s; // seconds
+//const int32 Gpib::DEFAULT_TIMEOUT = T3s; // seconds
 const int32 Gpib::DEFAULT_EOI = 1;
 const int32 Gpib::DEFAULT_EOS = 0;
 const int32 Gpib::DEFAULT_SAD = 0; // seconds

src/drivers/legacy/def/GPIBDef.h

@@ -23,11 +23,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#ifdef MACOSX
-#include "ni488.h"
-#else
-#include "gpib/ib.h"
-#endif
+//#ifdef MACOSX
+//#include "ni488.h"
+//#else
+//#include "gpib/ib.h"
+//#endif
 
 namespace GPIBDef {
 
@@ -42,7 +42,7 @@ static const int32 EOS_ON = 1; // seconds
 static const int32 EOS_OFF = 0; // seconds 
 static const int32 EOT_ON = 1; // seconds 
 static const int32 EOT_OFF = 0; // seconds 
-static const int32 DEFAULT_TIMEOUT = T3s; // seconds 
+//static const int32 DEFAULT_TIMEOUT = T3s; // seconds
 static const int32 DEFAULT_EOI = 1;
 static const int32 DEFAULT_EOS = 0;
 static const int32 DEFAULT_SAD = 0; // seconds 
@@ -60,4 +60,4 @@ static const char LF[] = "\xA";
 
 }
 
-#endif //GPIBDEF_H
\ No newline at end of file
+#endif //GPIBDEF_H

src/drivers/legacy/nationalinst/gpib/RealGPIBDriver.cpp

@@ -100,7 +100,7 @@ void RealGPIBDriver::init()
     ostringstream devbuf;
      int32 id = ibdev(unit,loop,
     		 			    GPIBDef::DEFAULT_SAD,
-    		 			    GPIBDef::DEFAULT_TIMEOUT,
+							T3s,
     		 			    GPIBDef::DEFAULT_EOI,
     		 			    GPIBDef::DEFAULT_EOS);
     if (id<0) {