Index: branches/BNC_2.12/src/RTCM3/clock_and_orbit/clock_orbit_igs.c
===================================================================
--- branches/BNC_2.12/src/RTCM3/clock_and_orbit/clock_orbit_igs.c	(revision 8987)
+++ branches/BNC_2.12/src/RTCM3/clock_and_orbit/clock_orbit_igs.c	(revision 8988)
@@ -576,5 +576,5 @@
     return GCOBR_SHORTBUFFER;
 
-#ifdef BNC_DEBUG
+#ifdef DEBUG
   fprintf(stderr, "GetSSR START: size %d, numbits %d\n",(int)size, numbits);
 #endif
@@ -597,9 +597,9 @@
   G_RTCM_MESSAGE_NUMBER(type)
   G_IGS_SSR_VERSION(version)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
   fprintf(stderr, "rtcmType %d igsVersion %d ",type, version);
 #endif
   G_IGS_MESSAGE_NUMBER(type)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
   fprintf(stderr, "igsType IM%d size %d\n",type,(int)sizeofrtcmblock);
 #endif
@@ -620,5 +620,5 @@
     G_VTEC_QUALITY_INDICATOR(v->Quality)
     G_NO_IONO_LAYERS(v->NumLayers)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d ssrIod %d providerId %d solId %d vtecQ %8.3f numLay %d \n",
         		  v->EpochTime, v->UpdateInterval, mmi,
@@ -629,5 +629,5 @@
       G_IONO_DEGREE(v->Layers[l].Degree)
       G_IONO_ORDER(v->Layers[l].Order)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "h  %8.3f deg %d ord %d \n",
         		  v->Layers[l].Height, v->Layers[l].Degree, v->Layers[l].Order);
@@ -636,5 +636,5 @@
         for (d = o; d <= v->Layers[l].Degree; ++d) {
           G_IONO_COEFF_C(v->Layers[l].Cosinus[d][o])
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "C[%02d][%02d]  %8.3f \n",
         		  d, o, v->Layers[l].Cosinus[d][o]);
@@ -645,5 +645,5 @@
         for (d = o; d <= v->Layers[l].Degree; ++d) {
           G_IONO_COEFF_S(v->Layers[l].Sinus[d][o])
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "S[%02d][%02d]  %8.3f \n",
         		  d, o, v->Layers[l].Sinus[d][o]);
@@ -652,5 +652,5 @@
       }
     }
-#ifdef BNC_DEBUG
+#ifdef DEBUG
     for(type = 0; type < (unsigned int)size && (unsigned char)buffer[type] != 0xD3; ++type)
     numbits += 8;
@@ -675,5 +675,5 @@
           G_NO_OF_SATELLITES(nums)
           co->Supplied[COBOFS_ORBIT] |= 1;
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d rd %d ssrIod %d providerId %d solId %d\n",
         		  co->EpochTime[s], co->UpdateInterval,mmi,co->NumberOfSat[s],nums,
@@ -698,5 +698,5 @@
             G_DELTA_DOT_ALONG_TRACK(co->Sat[pos].Orbit.DotDeltaAlongTrack)
             G_DELTA_DOT_CROSS_TRACK(co->Sat[pos].Orbit.DotDeltaCrossTrack)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d iod %3d dr %8.4f da %8.4f dc %8.4f dr %8.3f da %8.3f dc %8.3f\n",
                 co->Sat[pos].ID,co->Sat[pos].IOD,co->Sat[pos].Orbit.DeltaRadial,
@@ -720,5 +720,5 @@
           G_NO_OF_SATELLITES(nums)
           co->Supplied[COBOFS_CLOCK] |= 1;
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d ssrIod %d providerId %d solId %d\n",
         		  co->EpochTime[s], co->UpdateInterval,mmi,co->NumberOfSat[s],nums,
@@ -739,5 +739,5 @@
             G_DELTA_CLOCK_C1(co->Sat[pos].Clock.DeltaA1)
             G_DELTA_CLOCK_C2(co->Sat[pos].Clock.DeltaA2)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d c0 %8.3f c1 %8.3f c2 %8.3f\n",
                 co->Sat[pos].ID, co->Sat[pos].Clock.DeltaA0, co->Sat[pos].Clock.DeltaA1,
@@ -760,5 +760,5 @@
           co->Supplied[COBOFS_ORBIT] |= 1;
           co->Supplied[COBOFS_CLOCK] |= 1;
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d rd %d ssrIod %d providerId %d solId %d\n",
         		  co->EpochTime[s], co->UpdateInterval,mmi,co->NumberOfSat[s],nums,
@@ -786,5 +786,5 @@
             G_DELTA_CLOCK_C1(co->Sat[pos].Clock.DeltaA1)
             G_DELTA_CLOCK_C2(co->Sat[pos].Clock.DeltaA2)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d iod %3d dr %10.6f da %10.6f dc %10.6f dr %10.6f da %10.6f dc %10.6f  c0 %10.6f c1 %10.6f c2 %10.6f\n",
                 co->Sat[pos].ID,co->Sat[pos].IOD,co->Sat[pos].Orbit.DeltaRadial,
@@ -808,5 +808,5 @@
           G_NO_OF_SATELLITES(nums)
           co->Supplied[COBOFS_URA] |= 1;
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d ssrIod %d providerId %d solId %d\n",
         		  co->EpochTime[s], co->UpdateInterval,mmi,co->NumberOfSat[s],nums,
@@ -825,5 +825,5 @@
             co->Sat[pos].ID = id;
             G_SSR_URA(co->Sat[pos].UserRangeAccuracy)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d ura %8.3f \n",
                 co->Sat[pos].ID, co->Sat[pos].UserRangeAccuracy);
@@ -843,5 +843,5 @@
           G_NO_OF_SATELLITES(nums)
           co->Supplied[COBOFS_HR] |= 1;
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d ssrIod %d providerId %d solId %d\n",
         		  co->EpochTime[s], co->UpdateInterval,mmi,co->NumberOfSat[s],nums,
@@ -860,5 +860,5 @@
             co->Sat[pos].ID = id;
             G_HR_CLOCK_CORRECTION(co->Sat[pos].hrclock)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d hrClock %8.3f \n",
                     co->Sat[pos].ID, co->Sat[pos].hrclock);
@@ -877,5 +877,5 @@
           G_SSR_SOLUTION_ID(b->SSRSolutionID)
           G_NO_OF_SATELLITES(nums)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d ssrIod %d providerId %d solId %d\n",
         		  b->EpochTime[s], b->UpdateInterval,mmi,b->NumberOfSat[s],nums,
@@ -894,5 +894,5 @@
             b->Sat[pos].ID = id;
             G_NO_OF_BIASES(b->Sat[pos].NumberOfCodeBiases)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d #%d ",
                     b->Sat[pos].ID, b->Sat[pos].NumberOfCodeBiases);
@@ -901,10 +901,10 @@
               G_GNSS_SIGNAL_IDENTIFIER(b->Sat[pos].Biases[j].Type)
               G_CODE_BIAS(b->Sat[pos].Biases[j].Bias)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "t%02d b %8.2f ",
                     b->Sat[pos].Biases[j].Type, b->Sat[pos].Biases[j].Bias);
 #endif
             }
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "\n");
 #endif
@@ -924,5 +924,5 @@
             G_MW_CONSISTENCY_INDICATOR(pb->MWConsistencyIndicator)
             G_NO_OF_SATELLITES(nums)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d ssrIod %d providerId %d solId %d dispInd %d mwInd %d\n",
         		  pb->EpochTime[s], pb->UpdateInterval,mmi,pb->NumberOfSat[s],nums,
@@ -944,5 +944,5 @@
               G_YAW_ANGLE(pb->Sat[pos].YawAngle)
               G_YAW_RATE(pb->Sat[pos].YawRate)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d #%d y %10.6f yr %10.6f ",
                     pb->Sat[pos].ID, pb->Sat[pos].NumberOfPhaseBiases,
@@ -955,5 +955,5 @@
                 G_DISCONTINUITY_COUNTER(pb->Sat[pos].Biases[j].SignalDiscontinuityCounter)
                 G_PHASE_BIAS(pb->Sat[pos].Biases[j].Bias)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "t%02d int %d wl %d disc %d b %8.4f ",
                     pb->Sat[pos].Biases[j].Type,
@@ -964,5 +964,5 @@
 #endif
               }
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "\n");
 #endif
@@ -972,5 +972,5 @@
           continue;
       }
-#ifdef BNC_DEBUG
+#ifdef DEBUG
       for(type = 0; type < (unsigned int)size && (unsigned char)buffer[type] != 0xD3; ++type)
       numbits += 8;
Index: branches/BNC_2.12/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.c
===================================================================
--- branches/BNC_2.12/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.c	(revision 8987)
+++ branches/BNC_2.12/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.c	(revision 8988)
@@ -766,5 +766,5 @@
     return GCOBR_SHORTBUFFER;
 
-#ifdef BNC_DEBUG
+#ifdef DEBUG
   fprintf(stderr, "GetSSR START: size %d, numbits %d\n",(int)size, numbits);
 #endif
@@ -786,5 +786,5 @@
 
   G_RTCM_MESSAGE_NUMBER(type)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
   fprintf(stderr, "type %d size %d\n",type,(int)sizeofrtcmblock);
 #endif
@@ -804,5 +804,5 @@
     G_VTEC_QUALITY_INDICATOR(v->Quality)
     G_NO_IONO_LAYERS(v->NumLayers)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d ssrIod %d providerId %d solId %d vtecQ %8.3f numLay %d \n",
         		  v->EpochTime, v->UpdateInterval, mmi,
@@ -813,5 +813,5 @@
       G_IONO_DEGREE(v->Layers[l].Degree)
       G_IONO_ORDER(v->Layers[l].Order)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "h  %8.3f deg %d ord %d \n",
         		  v->Layers[l].Height, v->Layers[l].Degree, v->Layers[l].Order);
@@ -820,5 +820,5 @@
         for (d = o; d <= v->Layers[l].Degree; ++d) {
           G_IONO_COEFF(v->Layers[l].Cosinus[d][o])
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "C[%02d][%02d]  %8.3f \n",
         		  d, o, v->Layers[l].Cosinus[d][o]);
@@ -829,5 +829,5 @@
         for (d = o; d <= v->Layers[l].Degree; ++d) {
           G_IONO_COEFF(v->Layers[l].Sinus[d][o])
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "S[%02d][%02d]  %8.3f \n",
         		  d, o, v->Layers[l].Sinus[d][o]);
@@ -836,5 +836,5 @@
       }
     }
-#ifdef BNC_DEBUG
+#ifdef DEBUG
     for(type = 0; type < (unsigned int)size && (unsigned char)buffer[type] != 0xD3; ++type)
     numbits += 8;
@@ -868,5 +868,5 @@
       G_MW_CONSISTENCY_INDICATOR(pb->MWConsistencyIndicator)
       G_NO_OF_SATELLITES(nums)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d ssrIod %d providerId %d solId %d dispInd %d mwInd %d\n",
         		  pb->EpochTime[s], pb->UpdateInterval,mmi,pb->NumberOfSat[s],nums,
@@ -901,5 +901,5 @@
         G_YAW_ANGLE(pb->Sat[pos].YawAngle)
         G_YAW_RATE(pb->Sat[pos].YawRate)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d #%d y %10.6f yr %10.6f ",
                     pb->Sat[pos].ID, pb->Sat[pos].NumberOfPhaseBiases,
@@ -914,5 +914,5 @@
               pb->Sat[pos].Biases[j].SignalDiscontinuityCounter)
           G_PHASE_BIAS(pb->Sat[pos].Biases[j].Bias)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "t%02d int %d wl %d disc %d b %8.4f ",
                     pb->Sat[pos].Biases[j].Type,
@@ -923,9 +923,9 @@
 #endif
         }
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "\n");
 #endif
       }
-#ifdef BNC_DEBUG
+#ifdef DEBUG
       for(type = 0; type < (unsigned int)size && (unsigned char)buffer[type] != 0xD3; ++type)
       numbits += 8;
@@ -960,5 +960,5 @@
           G_NO_OF_SATELLITES(nums)
           co->Supplied[COBOFS_ORBIT] |= 1;
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d rd %d ssrIod %d providerId %d solId %d\n",
         		  co->EpochTime[s], co->UpdateInterval,mmi,co->NumberOfSat[s],nums,
@@ -1016,5 +1016,5 @@
             G_DELTA_DOT_ALONG_TRACK(co->Sat[pos].Orbit.DotDeltaAlongTrack)
             G_DELTA_DOT_CROSS_TRACK(co->Sat[pos].Orbit.DotDeltaCrossTrack)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d iod %3d dr %8.4f da %8.4f dc %8.4f dr %8.3f da %8.3f dc %8.3f\n",
                 co->Sat[pos].ID,co->Sat[pos].IOD,co->Sat[pos].Orbit.DeltaRadial,
@@ -1049,5 +1049,5 @@
           G_NO_OF_SATELLITES(nums)
           co->Supplied[COBOFS_CLOCK] |= 1;
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d ssrIod %d providerId %d solId %d\n",
         		  co->EpochTime[s], co->UpdateInterval,mmi,co->NumberOfSat[s],nums,
@@ -1082,5 +1082,5 @@
             G_DELTA_CLOCK_C1(co->Sat[pos].Clock.DeltaA1)
             G_DELTA_CLOCK_C2(co->Sat[pos].Clock.DeltaA2)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d c0 %8.3f c1 %8.3f c2 %8.3f\n",
                 co->Sat[pos].ID, co->Sat[pos].Clock.DeltaA0, co->Sat[pos].Clock.DeltaA1,
@@ -1114,5 +1114,5 @@
           co->Supplied[COBOFS_ORBIT] |= 1;
           co->Supplied[COBOFS_CLOCK] |= 1;
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d rd %d ssrIod %d providerId %d solId %d\n",
         		  co->EpochTime[s], co->UpdateInterval,mmi,co->NumberOfSat[s],nums,
@@ -1173,5 +1173,5 @@
             G_DELTA_CLOCK_C1(co->Sat[pos].Clock.DeltaA1)
             G_DELTA_CLOCK_C2(co->Sat[pos].Clock.DeltaA2)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d iod %3d dr %10.6f da %10.6f dc %10.6f dr %10.6f da %10.6f dc %10.6f  c0 %10.6f c1 %10.6f c2 %10.6f\n",
                 co->Sat[pos].ID,co->Sat[pos].IOD,co->Sat[pos].Orbit.DeltaRadial,
@@ -1206,5 +1206,5 @@
           G_NO_OF_SATELLITES(nums)
           co->Supplied[COBOFS_URA] |= 1;
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d ssrIod %d providerId %d solId %d\n",
         		  co->EpochTime[s], co->UpdateInterval,mmi,co->NumberOfSat[s],nums,
@@ -1236,5 +1236,5 @@
             co->Sat[pos].ID = id;
             G_SSR_URA(co->Sat[pos].UserRangeAccuracy)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d ura %8.3f \n",
                 co->Sat[pos].ID, co->Sat[pos].UserRangeAccuracy);
@@ -1265,5 +1265,5 @@
           G_NO_OF_SATELLITES(nums)
           co->Supplied[COBOFS_HR] |= 1;
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d ssrIod %d providerId %d solId %d\n",
         		  co->EpochTime[s], co->UpdateInterval,mmi,co->NumberOfSat[s],nums,
@@ -1295,5 +1295,5 @@
             co->Sat[pos].ID = id;
             G_HR_CLOCK_CORRECTION(co->Sat[pos].hrclock)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d hrClock %8.3f \n",
                     co->Sat[pos].ID, co->Sat[pos].hrclock);
@@ -1323,5 +1323,5 @@
           G_SSR_SOLUTION_ID(b->SSRSolutionID)
           G_NO_OF_SATELLITES(nums)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
           fprintf(stderr, "epochTime %d ui %d mmi %d sats %d/%d ssrIod %d providerId %d solId %d\n",
         		  b->EpochTime[s], b->UpdateInterval,mmi,b->NumberOfSat[s],nums,
@@ -1353,5 +1353,5 @@
             b->Sat[pos].ID = id;
             G_NO_OF_CODE_BIASES(b->Sat[pos].NumberOfCodeBiases)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "id %2d #%d ",
                     b->Sat[pos].ID, b->Sat[pos].NumberOfCodeBiases);
@@ -1360,10 +1360,10 @@
               G_SIGNAL_IDENTIFIER(b->Sat[pos].Biases[j].Type)
               G_CODE_BIAS(b->Sat[pos].Biases[j].Bias)
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "t%02d b %8.2f ",
                     b->Sat[pos].Biases[j].Type, b->Sat[pos].Biases[j].Bias);
 #endif
             }
-#ifdef BNC_DEBUG
+#ifdef DEBUG
             fprintf(stderr, "\n");
 #endif
@@ -1373,5 +1373,5 @@
           continue;
       }
-#ifdef BNC_DEBUG
+#ifdef DEBUG
       for(type = 0; type < (unsigned int)size && (unsigned char)buffer[type] != 0xD3; ++type)
       numbits += 8;