Changeset 95 in ntrip

Timestamp:

Sep 1, 2006, 9:36:54 AM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/rtcm3torinex.cpp (modified) (8 diffs)
• bnc.pro (modified) (1 diff)

trunk/BNC/RTCM3/rtcm3torinex.cpp

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.cpp,v 1.3 2006/08/25 11:50:34 mervart Exp $
+  $Id: rtcm3torinex.cpp,v 1.4 2006/08/31 09:20:09 mervart Exp $
 
   Program written bei
@@ -36 +36 @@
 */
 
+#ifndef NO_RTCM3_MAIN
+#include <stdint.h>
+#include <getopt.h>
+#endif
+
 #include <ctype.h>
 #include <errno.h>
-#include <getopt.h>
 #include <math.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <signal.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -52 +55 @@
 #include <unistd.h>
 
+
+
 /* The string, which is send as agent in HTTP request */
 #define AGENTSTRING "NTRIP NtripRTCM3ToRINEX"
@@ -57 +62 @@
 #define MAXDATASIZE 1000 /* max number of bytes we can get at once */
 
+#include "rtcm3torinex.h"
+
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.3 $";
-static char datestr[]     = "$Date: 2006/08/25 11:50:34 $";
+static char revisionstr[] = "$Revision: 1.4 $";
+static char datestr[]     = "$Date: 2006/08/31 09:20:09 $";
 static int stop = 0;
 
-
-
-#include "rtcm3torinex.h"
-
+#ifndef NO_RTCM3_MAIN
 
 struct Args
@@ -157 +161 @@
   return res;
 }
+#endif
+
 
 static const char encodingTable [64] = {
@@ -732 +738 @@
   }
 
-#ifdef RTCM_TRANSFORM_MAIN
+
   for(i = 0; i < hdata.numheaders; ++i)
     printf("%s\n", hdata.data.unnamed[i]);
   printf("                                                            "
   "END OF HEADER\n");
-#endif
-}
+}
+
+#ifndef NO_RTCM3_MAIN
 
 /* let the output complete a block if necessary */
@@ -853 +860 @@
 }
 
-#ifdef RTCM_TRANSFORM_MAIN
 int main(int argc, char **argv)
 {
@@ -995 +1001 @@
   return 0;
 }
-#endif
-
+
+#endif   // NO_RTCM3_MAIN

trunk/BNC/bnc.pro

@@ +1 @@
+
+DEFINES += NO_RTCM3_MAIN
 
 HEADERS =             bncgetthread.h    bncwindow.h   bnctabledlg.h   \