diff --git a/cint/src/global2.c b/cint/src/global2.c
index 440bfbb5c729410a7cc8b3506a69235e1b0fd548..ab35062daacef90a4cc0a608eaa12376eacb8620 100644
--- a/cint/src/global2.c
+++ b/cint/src/global2.c
@@ -484,12 +484,8 @@ int G__last_error = 0;
 int G__dispmsg = G__DISPALL;
 
 #ifndef G__OLDIMPLEMENTATION1700
-#ifdef G__ROOT
-int G__default_link = 0;
-#else
 int G__default_link = 1;
 #endif
-#endif
 
 /* 1713 */
 int G__gettingspecial = 0;
diff --git a/cint/src/init.c b/cint/src/init.c
index bf6f8322e0bba45a1c97528be26b969e508243a3..b35cc04d3dd142224c581b757370210bdda6f0d8 100644
--- a/cint/src/init.c
+++ b/cint/src/init.c
@@ -1014,7 +1014,7 @@ char *argv[] ;
        */
       G__globalcomp=atoi(optarg);
 #ifndef G__OLDIMPLEMENTATION1700
-      if(G__globalcomp>=10) {
+      if(abs(G__globalcomp)>=10) {
 	G__default_link = abs(G__globalcomp)%10;
 	G__globalcomp /= 10;
       }
diff --git a/cint/src/newlink.c b/cint/src/newlink.c
index a158962e4ec41a1787f5cbbaf68fc47112d1e0f8..4f86b6c689e7799b00839c4a41c058b19d3bf133 100644
--- a/cint/src/newlink.c
+++ b/cint/src/newlink.c
@@ -1878,6 +1878,10 @@ char *dllid;
   }
 
   G__globalcomp = atoi(mode); /* this is redundant */
+  if(abs(G__globalcomp)>=10) {
+     G__default_link = abs(G__globalcomp)%10;
+     G__globalcomp /= 10;
+  }
   G__store_globalcomp=G__globalcomp;
 
 #ifndef G__OLDIMPLEMENTATION1098
diff --git a/cint/src/v6_global2.cxx b/cint/src/v6_global2.cxx
index 440bfbb5c729410a7cc8b3506a69235e1b0fd548..ab35062daacef90a4cc0a608eaa12376eacb8620 100644
--- a/cint/src/v6_global2.cxx
+++ b/cint/src/v6_global2.cxx
@@ -484,12 +484,8 @@ int G__last_error = 0;
 int G__dispmsg = G__DISPALL;
 
 #ifndef G__OLDIMPLEMENTATION1700
-#ifdef G__ROOT
-int G__default_link = 0;
-#else
 int G__default_link = 1;
 #endif
-#endif
 
 /* 1713 */
 int G__gettingspecial = 0;
diff --git a/cint/src/v6_init.cxx b/cint/src/v6_init.cxx
index bf6f8322e0bba45a1c97528be26b969e508243a3..b35cc04d3dd142224c581b757370210bdda6f0d8 100644
--- a/cint/src/v6_init.cxx
+++ b/cint/src/v6_init.cxx
@@ -1014,7 +1014,7 @@ char *argv[] ;
        */
       G__globalcomp=atoi(optarg);
 #ifndef G__OLDIMPLEMENTATION1700
-      if(G__globalcomp>=10) {
+      if(abs(G__globalcomp)>=10) {
 	G__default_link = abs(G__globalcomp)%10;
 	G__globalcomp /= 10;
       }
diff --git a/cint/src/v6_newlink.cxx b/cint/src/v6_newlink.cxx
index a158962e4ec41a1787f5cbbaf68fc47112d1e0f8..4f86b6c689e7799b00839c4a41c058b19d3bf133 100644
--- a/cint/src/v6_newlink.cxx
+++ b/cint/src/v6_newlink.cxx
@@ -1878,6 +1878,10 @@ char *dllid;
   }
 
   G__globalcomp = atoi(mode); /* this is redundant */
+  if(abs(G__globalcomp)>=10) {
+     G__default_link = abs(G__globalcomp)%10;
+     G__globalcomp /= 10;
+  }
   G__store_globalcomp=G__globalcomp;
 
 #ifndef G__OLDIMPLEMENTATION1098
diff --git a/utils/src/rootcint.cxx b/utils/src/rootcint.cxx
index 71796dfe8e5e2d9637cddeb32733513fca2b2839..f1f0fa35162e23f3129083c28be6c644e1b582b1 100644
--- a/utils/src/rootcint.cxx
+++ b/utils/src/rootcint.cxx
@@ -1,4 +1,4 @@
-// @(#)root/utils:$Name:  $:$Id: rootcint.cxx,v 1.105 2002/10/22 06:43:20 brun Exp $
+// @(#)root/utils:$Name:  $:$Id: rootcint.cxx,v 1.106 2002/10/22 10:37:45 brun Exp $
 // Author: Fons Rademakers   13/07/96
 
 /*************************************************************************
@@ -3031,7 +3031,7 @@ int main(int argc, char **argv)
          argvv[argcc++] = "-DSYSV";
          argvv[argcc++] = "-D__MAKECINT__";
          argvv[argcc++] = "-V";        // include info on private members
-         argvv[argcc++] = "-c-1";
+         argvv[argcc++] = "-c-10";
          argvv[argcc++] = "+V";        // turn on class comment mode
 #ifdef ROOTBUILD
          argvv[argcc++] = "base/inc/TROOT.h";