--- a/AbstractOperatingSystem.st	Mon May 06 08:18:56 2002 +0200
+++ b/AbstractOperatingSystem.st	Mon May 06 09:37:15 2002 +0200
@@ -3032,54 +3032,54 @@
 %{  /* NOCONTEXT */
 
 #   ifdef vax
-#    define CPU_STRING "vax"
+#    define CPU_SYMBOL @symbol(vax)
 #   endif
 #   ifdef mips
-#    define CPU_STRING "mips"
+#    define CPU_SYMBOL @symbol(mips)
 #   endif
 #   ifdef i386
-#    define CPU_STRING "i386"
+#    define CPU_SYMBOL @symbol(i386)
 #   endif
 #   ifdef i860
-#    define CPU_STRING "i860"
+#    define CPU_SYMBOL @symbol(i860)
 #   endif
 #   ifdef ns32k
-#    define CPU_STRING "ns32k"
+#    define CPU_SYMBOL @symbol(ns32k)
 #   endif
 #   ifdef mc68k
-#    define CPU_STRING "mc68k"
+#    define CPU_SYMBOL @symbol(mc68k)
 #   endif
 #   ifdef mc88k
-#    define CPU_STRING "mc88k"
+#    define CPU_SYMBOL @symbol(mc88k)
 #   endif
 #   ifdef sparc
-#    define CPU_STRING "sparc"
+#    define CPU_SYMBOL @symbol(sparc)
 #   endif
 #   ifdef hppa
-#    define CPU_STRING "hppa"
+#    define CPU_SYMBOL @symbol(hppa)
 #   endif
 #   ifdef rs6000
-#    define CPU_STRING "rs6000"
+#    define CPU_SYMBOL @symbol(rs6000)
 #   endif
 #   ifdef powerPC
-#    define CPU_STRING "powerPC"
+#    define CPU_SYMBOL @symbol(powerPC)
 #   endif
 #   ifdef alpha
-#    define CPU_STRING "alpha"
+#    define CPU_SYMBOL @symbol(alpha)
 #   endif
 #   ifdef transputer
-#    define CPU_STRING "transputer"
+#    define CPU_SYMBOL @symbol(transputer)
 #   endif
 #   ifdef ibm370
-#    define CPU_STRING "ibm370"
+#    define CPU_SYMBOL @symbol(ibm370)
 #   endif
 
-#   ifndef CPU_STRING
-#    define CPU_STRING "unknown"
+#   ifndef CPU_SYMBOL
+#    define CPU_SYMBOL @symbol(unknown)
 #   endif
 
-    cpu = __MKSTRING(CPU_STRING);
-#   undef CPU_STRING
+    cpu = CPU_SYMBOL;
+#   undef CPU_SYMBOL
 %}.
     ^ cpu
 
@@ -3223,99 +3223,99 @@
 %{  /* NOCONTEXT */
 
 #   ifdef MSDOS
-#    define OS_STRING "msdos"
+#    define OS_SYMBOL @symbol(msdos)
 #   endif
 
 #   ifdef WIN32
-#    define OS_STRING "win32"
+#    define OS_SYMBOL @symbol(win32)
 #   endif
 
 #   ifdef MSWINDOWS
-#    define OS_STRING "mswindows"
+#    define OS_SYMBOL @symbol(mswindows)
 #   endif
 
 #   ifdef VMS
 #    ifdef __openVMS__
-#     define OS_STRING "openVMS"
+#     define OS_SYMBOL @symbol(openVMS)
 #    else
-#     define OS_STRING "VMS"
+#     define OS_SYMBOL @symbol(VMS)
 #    endif
 #   endif
 
 #   ifdef MVS /* ;-) */
-#    define OS_STRING "mvs"
+#    define OS_SYMBOL @symbol(mvs)
 #   endif
 
 #   ifdef OS2
-#    define OS_STRING "os2"
+#    define OS_SYMBOL @symbol(os2)
 #   endif
 
 #   ifdef sinix
-#    define OS_STRING "sinix"
+#    define OS_SYMBOL @symbol(sinix)
 #   endif
 
 #   ifdef ultrix
-#    define OS_STRING "ultrix"
+#    define OS_SYMBOL @symbol(ultrix)
 #   endif
 
 #   ifdef sco
-#    define OS_STRING "sco"
+#    define OS_SYMBOL @symbol(sco)
 #   endif
 
 #   ifdef hpux
-#    define OS_STRING "hpux"
+#    define OS_SYMBOL @symbol(hpux)
 #   endif
 
 #   ifdef LINUX
-#    define OS_STRING "linux"
+#    define OS_SYMBOL @symbol(linux)
 #   endif
 
 #   ifdef sunos
-#    define OS_STRING "sunos"
+#    define OS_SYMBOL @symbol(sunos)
 #   endif
 
 #   ifdef solaris
-#    define OS_STRING "solaris"
+#    define OS_SYMBOL @symbol(solaris)
 #   endif
 
 #   ifdef IRIS
-#    define OS_STRING "irix"
+#    define OS_SYMBOL @symbol(irix)
 #   endif
 
 #   ifdef aix
-#    define OS_STRING "aix"
+#    define OS_SYMBOL @symbol(aix)
 #   endif
 
 #   ifdef realIX
-#    define OS_STRING "realIX"
+#    define OS_SYMBOL @symbol(realIX)
 #   endif
 
 #   ifdef __osf__
-#    define OS_STRING "osf"
+#    define OS_SYMBOL @symbol(osf)
 #   endif
 
     /*
      * no concrete info; become somewhat vague ...
      */
-#   ifndef OS_STRING
+#   ifndef OS_SYMBOL
 #    ifdef MACH
-#     define OS_STRING "mach"
+#     define OS_SYMBOL @symbol(mach)
 #    endif
 #   endif
 
-#   ifndef OS_STRING
+#   ifndef OS_SYMBOL
 #    ifdef BSD
-#     define OS_STRING "bsd"
+#     define OS_SYMBOL @symbol(bsd)
 #    endif
 
 #    ifdef SYSV
 #     ifdef SYSV3
-#      define OS_STRING "sys5_3"
+#      define OS_SYMBOL @symbol(sys5_3)
 #     else
 #      ifdef SYSV4
-#       define OS_STRING "sys5_4"
+#       define OS_SYMBOL @symbol(sys5_4)
 #      else
-#       define OS_STRING "sys5"
+#       define OS_SYMBOL @symbol(sys5)
 #      endif
 #     endif
 #    endif
@@ -3324,24 +3324,24 @@
     /*
      * become very vague ...
      */
-#   ifndef OS_STRING
+#   ifndef OS_SYMBOL
 #    ifdef POSIX
-#     define OS_STRING "posix"
+#     define OS_SYMBOL @symbol(posix)
 #    endif
 #   endif
-#   ifndef OS_STRING
+#   ifndef OS_SYMBOL
 #    ifdef UNIX
-#     define OS_STRING "unix"
+#     define OS_SYMBOL @symbol(unix)
 #    endif
 #   endif
 
-#   ifndef OS_STRING
-#    define OS_STRING "unknown"
+#   ifndef OS_SYMBOL
+#    define OS_SYMBOL @symbol(unknown)
 #   endif
 
-    os = __MKSTRING(OS_STRING);
-
-#   undef OS_STRING
+    os = OS_SYMBOL;
+
+#   undef OS_SYMBOL
 %}.
     ^ os
 
@@ -4462,6 +4462,6 @@
 !AbstractOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.62 2002-02-26 13:02:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.63 2002-05-06 07:37:15 stefan Exp $'
 ! !
 AbstractOperatingSystem initialize!