build: get rid of HTTPINFO_PUD define
authorFerry Huberts <ferry.huberts@pelagic.nl>
Mon, 13 Jun 2016 11:54:33 +0000 (13:54 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Tue, 14 Jun 2016 07:21:25 +0000 (09:21 +0200)
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Makefile.inc
lib/httpinfo/src/olsrd_httpinfo.c
lib/pud/src/receiver.c
src/cfgparser/olsrd_conf.c
src/olsr_cfg.h

index 1058608..03ed984 100644 (file)
@@ -128,7 +128,6 @@ DOCDIR_OLSRD ?= $(DOCDIR)/$(EXENAME)
 
 
 CPPFLAGS  = -Isrc -I$(TOPDIR)/src -I$(TOPDIR)/lib -I$(TOPDIR)/lib/pud/nmealib/include -I$(TOPDIR)/lib/pud/wireformat/include
-CPPFLAGS += -DHTTPINFO_PUD
 
 # include OS specific compiler settings
 -include $(TOPDIR)/make/Makefile.$(OS).compiler
index d6a060b..3c329c1 100644 (file)
 #include "defs.h"
 #include "lq_plugin.h"
 #include "common/autobuf.h"
-#ifdef HTTPINFO_PUD
-  #include <pud/src/receiver.h>
-  #include <pud/src/pud.h>
-  #include <nmea/info.h>
-  #include <nmea/sentence.h>
-#endif /* HTTPINFO_PUD */
+#include <pud/src/receiver.h>
+#include <pud/src/pud.h>
+#include <nmea/info.h>
+#include <nmea/sentence.h>
 
 #include "olsrd_httpinfo.h"
 #include "admin_interface.h"
@@ -193,9 +191,7 @@ static void build_all_body(struct autobuf *);
 static void build_sgw_body(struct autobuf *);
 #endif /* __linux__ */
 
-#ifdef HTTPINFO_PUD
 static void build_pud_body(struct autobuf *);
-#endif /* HTTPINFO_PUD */
 
 static void build_about_body(struct autobuf *);
 
@@ -230,9 +226,7 @@ static const struct tab_entry tab_entries[] = {
 #ifdef __linux__
   {"Smart Gateway", "sgw", build_sgw_body, true},
 #endif /* __linux__ */
-#ifdef HTTPINFO_PUD
   {"Position", "position", build_pud_body, true},
-#endif /* HTTPINFO_PUD */
   {"All", "all", build_all_body, true},
 #ifdef ADMIN_INTERFACE
   {"Admin", "admin", build_admin_body, true},
@@ -1112,12 +1106,8 @@ build_all_body(struct autobuf *abuf)
 #ifdef __linux__
   build_sgw_body(abuf);
 #endif /* __linux__ */
-#ifdef HTTPINFO_PUD
   build_pud_body(abuf);
-#endif /* HTTPINFO_PUD */
 }
-
-#ifdef HTTPINFO_PUD
 /**
  * Determine if a nmeaINFO structure has a certain field.
  * We need this function locally because nmealib might not be loaded.
@@ -1524,7 +1514,6 @@ static void build_pud_body(struct autobuf *abuf) {
                );
        }
 }
-#endif /* HTTPINFO_PUD */
 
 #ifdef __linux__
 
index af4bc3b..ec79b26 100644 (file)
@@ -985,9 +985,8 @@ bool startReceiver(void) {
        transmitGpsInformation.positionUpdated = false;
        transmitGpsInformation.nodeId = getNodeId(NULL);
 
-#ifdef HTTPINFO_PUD
        olsr_cnf->pud_position = &transmitGpsInformation;
-#endif /* HTTPINFO_PUD */
+
        initPositionAverageList(&positionAverageList, getAverageDepth());
 
        if (!initOlsrTxTimer()) {
index 30001ce..b5b4ea4 100644 (file)
@@ -1186,9 +1186,7 @@ set_default_cnf(struct olsrd_config *cnf, char * configuration_file)
 #endif /* defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__ || defined __NetBSD__ || defined __OpenBSD__ */
   cnf->lq_nat_thresh = DEF_LQ_NAT_THRESH;
 
-#ifdef HTTPINFO_PUD
   cnf->pud_position = NULL;
-#endif /* HTTPINFO_PUD */
 }
 
 struct if_config_options *
index 34d583c..97efaa4 100644 (file)
@@ -50,9 +50,7 @@
 #include "defs.h"
 #include "olsr_types.h"
 #include "common/autobuf.h"
-#ifdef HTTPINFO_PUD
 #include "pud/src/receiver.h"
-#endif /* HTTPINFO_PUD */
 
 /* set to 1 to collect all startup sleep into one sleep
  * (just as long as the longest sleep)
@@ -385,9 +383,7 @@ struct olsrd_config {
 #endif /* defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__ || defined __NetBSD__ || defined __OpenBSD__ */
   float lq_nat_thresh;
 
-#ifdef HTTPINFO_PUD
   TransmitGpsInformation * pud_position;
-#endif /* HTTPINFO_PUD */
 };
 
 #if defined __cplusplus