Fix up some compilation issues if both web100 and web10g are missing

ndt-project · Apr 29, 2015 · 035a4c4 · 035a4c4
1 parent adc0980
commit 035a4c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/network.h b/src/network.h
@@ -10,14 +10,16 @@
 #define SRC_NETWORK_H_
 
 #include <I2util/util.h>
-#include "testoptions.h"
 
 #define NDT_BACKLOG 5
 #define BUFFSIZE  8192
 
 #define OPT_IPV6_ONLY 1
 #define OPT_IPV4_ONLY 2
 
+#define JSON_SUPPORT 1
+#define WEBSOCKET_SUPPORT 2
+
 I2Addr CreateListenSocket(I2Addr addr, char* serv, int options, int buf_size);
 int CreateConnectSocket(int* sockfd, I2Addr local_addr, I2Addr server_addr,
                         int option, int buf_sizes);

diff --git a/src/testoptions.h b/src/testoptions.h
@@ -18,9 +18,6 @@
 #define RETRY_EXCEEDED_WAITING_DATA -102
 #define SOCKET_STATUS_FAILED -1
 
-#define JSON_SUPPORT 1
-#define WEBSOCKET_SUPPORT 2
-
 typedef struct testoptions {
   int multiple;  // multiples tests enabled
   int mainport;  // main port used for test

diff --git a/src/web100-util.c b/src/web100-util.c
@@ -17,6 +17,7 @@
 #include "utils.h"
 #include "web100srv.h"
 #include "jsonutils.h"
+#include "testoptions.h"
 
 struct tcp_name {
   char* web100_name;