File rtcmmc_fixcompilerbug2.diff of Package ntrip

Overview Repositories Revisions Requests Users Attributes Meta

File rtcmmc_fixcompilerbug2.diff of Package ntrip (Revision 89e39da15f7323721a3c3949e0ce1366)

Currently displaying revision 89e39da15f7323721a3c3949e0ce1366 , Show latest

diff -ur NtripRTCMMC/GPSDecoder.h NtripRTCMMC_new/GPSDecoder.h
--- NtripRTCMMC/GPSDecoder.h	2005-04-12 13:50:00.000000000 +0200
+++ NtripRTCMMC_new/GPSDecoder.h	2008-03-03 11:27:04.000000000 +0100
@@ -110,10 +110,10 @@
     short   SVEnable;   //< Not used - yet
 } ;
 
+#define lambda1 0.1902936727984 // [m]
+#define lambda2 0.2442102134241 // [m]
 class GPSDecoder {
  public:
-  static const double lambda1 = 0.1902936727984; // [m]
-  static const double lambda2 = 0.2442102134241; // [m]
   static const unsigned glonass_svid = 45;
   int iPCode;  // pointer for CA or P code on L1
 
diff -ur NtripRTCMMC/Makefile NtripRTCMMC_new/Makefile
--- NtripRTCMMC/Makefile	2005-02-21 20:31:54.000000000 +0100
+++ NtripRTCMMC_new/Makefile	2008-03-03 14:15:43.000000000 +0100
@@ -2,23 +2,8 @@
 #
 # $Id: Makefile,v 1.8 2004/11/23 16:16:32 becker Exp $
 MODE=Release
-
-# start "make MODE=Debug" for debug mode
-_gccRes := $(shell gcc --version)
-
-ifneq ($(word 1,$(_gccRes)),gcc)
-GCCVERSION := $(_gccRes)
-else
-GCCVERSION := $(word 3,$(_gccRes))
-endif
-ARCH := $(shell arch)
-UNAME := $(shell uname)
-OBJDIR := $(UNAME)-$(ARCH)-gcc$(GCCVERSION)
-
+OBJDIR := .
 CC = gcc
-ifeq ($(UNAME),SunOS)
-LOADLIBES += -lnsl -lsocket
-endif
 
 # rules
 $(OBJDIR)/Debug/%.o: %.C
@@ -60,5 +45,5 @@
 $O/%.d: %.cpp
 	@$(COMPILE.cc) -MM -MT '$$O/$*.o' -MT '$$O/$*.d' $*.cpp >$@
 
-include $(OBJS:%.o=%.d)
+#include $(OBJS:%.o=%.d)
 
diff -ur NtripRTCMMC/m_data.h NtripRTCMMC_new/m_data.h
--- NtripRTCMMC/m_data.h	2005-02-17 17:40:54.000000000 +0100
+++ NtripRTCMMC_new/m_data.h	2008-03-03 13:41:24.000000000 +0100
@@ -9,6 +9,7 @@
 
 #include <time.h>
 #include <ctype.h>
+#include <stdlib.h>
 
 #include <string>
 #include <vector>
diff -ur NtripRTCMMC/m_log.C NtripRTCMMC_new/m_log.C
--- NtripRTCMMC/m_log.C	2005-02-17 17:14:20.000000000 +0100
+++ NtripRTCMMC_new/m_log.C	2008-03-03 12:47:30.000000000 +0100
@@ -8,6 +8,7 @@
 #include "m_date.h"
 
 #include <string>
+#include <string.h>
 #include <iostream>
 #include <sys/types.h>
 #include <unistd.h>
diff -ur NtripRTCMMC/NTRIP.C NtripRTCMMC_new/NTRIP.C
--- NtripRTCMMC/NTRIP.C	2005-11-11 10:48:01.000000000 +0100
+++ NtripRTCMMC_new/NTRIP.C	2008-03-03 14:16:07.000000000 +0100
@@ -12,6 +12,7 @@
 #include <stropts.h>
 #include <poll.h>
 #include <string>
+#include <string.h>
 #include <iostream>
 
 // My includes

Places

File rtcmmc_fixcompilerbug2.diff of Package ntrip (Revision 89e39da15f7323721a3c3949e0ce1366)

Places