--- estic/icdevs.cc.orig	1997-03-05 20:48:44 UTC
+++ estic/icdevs.cc
@@ -157,8 +157,8 @@ const String& DevListBox::ServiceName (u
 String DevListBox::RerouteName (const String& Num)
 // Map the reroute capability to a string with fixed length
 {
-    const StringLength = 18;
-    const PadLength = 21;
+    const int StringLength = 18;
+    const int PadLength = 21;
     String Res (PadLength);
 
     if (Num.IsEmpty ()) {
@@ -269,9 +269,9 @@ static int ExtRerouteOk (const String& P
 static void EditExtReroute (const Point& Pos, IstecDevConfig& Config)
 // Edit the extended reroute capabilities of FW 2.0 in a separate menu
 {
-    const miPhone       = 10;
-    const miCondition   = 20;
-    const miRingCount   = 30;
+    const int miPhone       = 10;
+    const int miCondition   = 20;
+    const int miRingCount   = 30;
 
     // Load the menu
     Menue* M = (Menue*) LoadResource ("@ICDEVS.RerouteMenue");
@@ -407,38 +407,38 @@ static void EditDevConfig (IstecDevConfi
     static const String StgPosName = "EditDevConfig.ConfigMenue.Position";
 
     // Menue constants
-    const miDialCaps      = 10;
-    const miService       = 20;
-    const miReroute       = 30;         // Simple reroute, pre-2.00
-    const miChargePulse   = 40;
-    const miPIN           = 50;
-    const miTerminalMode  = 60;
-    const miKnockInt      = 70;
-    const miKnockExt      = 80;
-    const miKnockTFE      = 90;
-    const miExtReroute    = 100;        // Extended reroute, 2.00 and up
-    const miKnockInt21    = 1000;
-    const miKnockInt22    = 1010;
-    const miKnockInt23    = 1020;
-    const miKnockInt24    = 1030;
-    const miKnockInt25    = 1040;
-    const miKnockInt26    = 1050;
-    const miKnockInt27    = 1060;
-    const miKnockInt28    = 1070;
-    const miKnockMSN0     = 1100;
-    const miKnockMSN1     = 1110;
-    const miKnockMSN2     = 1120;
-    const miKnockMSN3     = 1130;
-    const miKnockMSN4     = 1140;
-    const miKnockMSN5     = 1150;
-    const miKnockMSN6     = 1160;
-    const miKnockMSN7     = 1170;
-    const miKnockMSN8     = 1180;
-    const miKnockMSN9     = 1190;
-    const miKnockTFE1     = 1200;
-    const miKnockTFE2     = 1210;
-    const miKnockTFE3     = 1220;
-    const miKnockTFE4     = 1230;
+    const int miDialCaps      = 10;
+    const int miService       = 20;
+    const int miReroute       = 30;         // Simple reroute, pre-2.00
+    const int miChargePulse   = 40;
+    const int miPIN           = 50;
+    const int miTerminalMode  = 60;
+    const int miKnockInt      = 70;
+    const int miKnockExt      = 80;
+    const int miKnockTFE      = 90;
+    const int miExtReroute    = 100;        // Extended reroute, 2.00 and up
+    const int miKnockInt21    = 1000;
+    const int miKnockInt22    = 1010;
+    const int miKnockInt23    = 1020;
+    const int miKnockInt24    = 1030;
+    const int miKnockInt25    = 1040;
+    const int miKnockInt26    = 1050;
+    const int miKnockInt27    = 1060;
+    const int miKnockInt28    = 1070;
+    const int miKnockMSN0     = 1100;
+    const int miKnockMSN1     = 1110;
+    const int miKnockMSN2     = 1120;
+    const int miKnockMSN3     = 1130;
+    const int miKnockMSN4     = 1140;
+    const int miKnockMSN5     = 1150;
+    const int miKnockMSN6     = 1160;
+    const int miKnockMSN7     = 1170;
+    const int miKnockMSN8     = 1180;
+    const int miKnockMSN9     = 1190;
+    const int miKnockTFE1     = 1200;
+    const int miKnockTFE2     = 1210;
+    const int miKnockTFE3     = 1220;
+    const int miKnockTFE4     = 1230;
 
 
     // Save the configuration into a memory stream, remember the CRC
