Index: bootstrp/rscdep.cxx
===================================================================
RCS file: /cvs/util/tools/bootstrp/rscdep.cxx,v
retrieving revision 1.13
diff -u -r1.13 rscdep.cxx
--- bootstrp/rscdep.cxx	21 Feb 2002 14:23:26 -0000	1.13
+++ bootstrp/rscdep.cxx	13 Apr 2003 13:31:10 -0000
@@ -338,7 +338,7 @@
  * it's too sad that getopt() is not available everywhere
  * note: this is not a full POSIX conforming getopt()
  */
-simple_getopt(int argc, char *argv[], const char *optstring)
+int simple_getopt(int argc, char *argv[], const char *optstring)
 {
     char *arg = argv[optind];
 
Index: inc/link.hxx
===================================================================
RCS file: /cvs/util/tools/inc/link.hxx,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 link.hxx
--- inc/link.hxx	18 Sep 2000 17:03:02 -0000	1.1.1.1
+++ inc/link.hxx	13 Apr 2003 13:31:11 -0000
@@ -83,7 +83,7 @@
     long Class::Method( ArgType ArgName )
 
 #define IMPL_STUB(Class, Method, ArgType) \
-    long __EXPORT Class##::LinkStub##Method( void* pThis, void* pCaller) \
+    long __EXPORT Class::LinkStub##Method( void* pThis, void* pCaller) \
     { \
         return ((Class*)pThis )->Method( (ArgType)pCaller ); \
     }
@@ -92,7 +92,7 @@
     long __EXPORT Class::Method( Class* pThis, ArgType ArgName )
 
 #define LINK( Inst, Class, Member ) \
-    Link( (Class*)Inst, (PSTUB)&Class##::LinkStub##Member )
+    Link( (Class*)Inst, (PSTUB)&Class::LinkStub##Member )
 
 #define STATIC_LINK( Inst, Class, Member ) \
     Link( (Class*)Inst, (PSTUB)&Class::Member )
Index: source/generic/supd.cxx
===================================================================
RCS file: /cvs/util/tools/source/generic/supd.cxx,v
retrieving revision 1.1
diff -u -r1.1 supd.cxx
--- source/generic/supd.cxx	9 Jan 2002 13:49:36 -0000	1.1
+++ source/generic/supd.cxx	13 Apr 2003 13:31:12 -0000
@@ -68,4 +68,4 @@
 unsigned getSUPD()
 {
 	return (unsigned)SUPD;
-}
\ No newline at end of file
+}