--- a/AbstractOperatingSystem.st	Thu Oct 13 02:25:10 2016 +0200
+++ b/AbstractOperatingSystem.st	Thu Oct 13 11:39:45 2016 +0200
@@ -4199,64 +4199,32 @@
 !AbstractOperatingSystem class methodsFor:'os queries'!
 
 getCCDefine
+    <resource: #obsolete>
+    
     "return a string which was used to identify the C-Compiler used
      when STX was compiled, and which should be passed down when compiling methods.
      For example, on linux, this is '__GNUC__';
-     on windows, this is either '__MSC__' or '__BORLANDC__'"
-
-%{  /* NOCONTEXT */
-#ifndef CC_DEFINE
-# ifdef __win32__
-#  if defined( __BORLANDC__ )
-#   define CC_DEFINE    "__BORLANDC__"
-#  else
-#   if defined( __VISUALC__ )
-#    define CC_DEFINE     "__VISUALC__"
-#   else
-#    if defined( __MINGW64__ )
-#     define CC_DEFINE     "__MINGW64__"
-#    else
-#     if defined( __MINGW32__ )
-#      define CC_DEFINE     "__MINGW32__"
-#     else
-#      define CC_DEFINE     "__CC__"
-#     endif
-#    endif
-#   endif
-#  endif
-# else /* not __win32__ */
-#  ifdef __CLANG__
-#   define CC_DEFINE     "__CLANG__"
-#  else
-#   ifdef __GNUC__
-#    define CC_DEFINE     "__GNUC__"
-#   else
-#    define CC_DEFINE     "__CC__"
-#   endif
-#  endif
-# endif
-#endif
-    RETURN ( __MKSTRING(CC_DEFINE));
-%}
+     on windows, this could be '__VISUALC__', '__BORLANDC__' or '__MINGW__'"
+
+    self obsoleteMethodWarning.
+    ^ STCCompilerInterface getCCDefine
+
     "
      OperatingSystem getCCDefine
     "
 !
 
 getCPUDefine
+    <resource: #obsolete>
     "return a string which was used to identify this CPU type when STX was
      compiled, and which should be passed down when compiling methods.
-     For example, on linux, this may be '-Di386'; on a vax, this would be '-Dvax'.
+     For example, on linux, this may be '-D__x86__'; on a vax, this would be '-D__vax__'.
      This is normally not of interest to 'normal' users; however, it is passed
      down to the c-compiler when methods are incrementally compiled to machine code."
 
-%{  /* NOCONTEXT */
-#   ifndef CPU_DEFINE
-#       define CPU_DEFINE "-DunknownCPU"
-#   endif
-
-    RETURN ( __MKSTRING(CPU_DEFINE));
-%}
+    self obsoleteMethodWarning.
+    ^ STCCompilerInterface getCPUDefine
+
     "
      OperatingSystem getCPUDefine
     "
@@ -4479,26 +4447,15 @@
 !
 
 getOSDefine
+    <resource: #obsolete>
+    
     "return a string which was used to identify this machine when stx was
      compiled, and which should be passed down when compiling methods.
-     For example, on linux, this is '-DLINUX'."
-
-%{  /* NOCONTEXT */
-
-#ifndef OS_DEFINE
-# ifdef __win32__
-#  define OS_DEFINE "-D__win32__"
-# endif
-
-# ifndef OS_DEFINE
-#  define OS_DEFINE "-DunknownOS"
-# endif
-#endif
-
-    RETURN ( __MKSTRING(OS_DEFINE));
-
-#undef OS_DEFINE
-%}
+     For example, on linux, this is '-D__linux__'."
+
+    self obsoleteMethodWarning.
+    ^ STCCompilerInterface getOSDefine
+
     "
      OperatingSystem getOSDefine
     "
@@ -4660,6 +4617,8 @@
 !
 
 getPlatformDefine
+    <resource: #obsolete>
+    
     "return a string which defines the platform,
      and which should be passed down when compiling methods.
      For example, on all unices, this is '-DUNIX'."