Index: trunk/BNC/src/RTCM/GPSDecoder.cpp
===================================================================
--- trunk/BNC/src/RTCM/GPSDecoder.cpp	(revision 4774)
+++ trunk/BNC/src/RTCM/GPSDecoder.cpp	(revision 5355)
@@ -47,5 +47,4 @@
 extern "C" {
 #include "rtcm3torinex.h"
-#include "rtcm3torinexsupport.h"
 }
 
@@ -127,5 +126,22 @@
   }
 
-  return rrinex3codetoentry(rnxStr.toAscii().data());
+  for (int ie = 0; ie <  GNSSENTRY_NUMBER; ie++) {
+    if (rnxStr.mid(1) == QString(_codetype[ie])) {
+      if      (rnxStr[0] == 'C') {
+        return ie + GNSSENTRY_CODE;
+      }
+      else if (rnxStr[0] == 'L') {
+        return ie + GNSSENTRY_PHASE;
+      }
+      else if (rnxStr[0] == 'D') {
+        return ie + GNSSENTRY_DOPPLER;
+      }
+      else if (rnxStr[0] == 'S') {
+        return ie + GNSSENTRY_SNR;
+      }
+    }
+  }
+  return -1;
+  ////  return rrinex3codetoentry(rnxStr.toAscii().data());
 }