* configure.ac.pamphlet: Don't define CPP LINUXplaform,

	MACOSXplaform, and MSYSplatoform macros.
src/
	* lib/XDither.c: Tidy.
	* lib/XShade.c: Likewise.
	* lib/XSpadFill.c: Likewise.
	* lib/bsdsignal.c: Likewise.
	* lib/edin.c: Likewise.
	* lib/fnct_key.c: Likewise.
	* lib/util.c: Likewise.
	* lib/wct.c: Likewise.

14 files changed, 46 insertions, 101 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c8eb7d7..ad4afe02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-20  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* configure.ac.pamphlet: Don't define CPP LINUXplaform,
+	MACOSXplaform, and MSYSplatoform macros.
+
 2009-09-16  Kosta Oikonomou <ko@research.att.com>
 	    Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
diff --git a/config/openaxiom-c-macros.h.in b/config/openaxiom-c-macros.h.in
index 07bd0ef8..b6c4fb56 100644
--- a/config/openaxiom-c-macros.h.in
+++ b/config/openaxiom-c-macros.h.in
@@ -3,9 +3,6 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
-/* BSD flavour */
-#undef BSDplatform
-
 /* Host has AF_LOCAL */
 #undef HAVE_AF_LOCAL
 
@@ -108,19 +105,10 @@
 /* Define to 1 if you have the <winsock2.h> header file. */
 #undef HAVE_WINSOCK2_H
 
-/* Linux flavour */
-#undef LINUXplatform
-
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR
 
-/* MACOX flavour */
-#undef MACOSXplatform
-
-/* MS */
-#undef MSYSplatform
-
 /* The kind of base runtime system for this build. */
 #undef OPENAXIOM_BASE_RTS
 
diff --git a/configure b/configure
index 64ab645f..4b440370 100755
--- a/configure
+++ b/configure
@@ -798,7 +798,6 @@ GCLOPTS
 LISP
 LDF
 CCF
-PLF
 openaxiom_host_has_regex
 axiom_use_x
 axiom_src_all
@@ -3736,13 +3735,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:3739: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3738: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3742: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3741: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3745: output\"" >&5)
+  (eval echo "\"\$as_me:3744: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -4945,7 +4944,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4948 "configure"' > conftest.$ac_ext
+  echo '#line 4947 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7093,11 +7092,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7096: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7095: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7100: \$? = $ac_status" >&5
+   echo "$as_me:7099: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7432,11 +7431,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7435: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7434: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7439: \$? = $ac_status" >&5
+   echo "$as_me:7438: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7537,11 +7536,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7540: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7539: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7544: \$? = $ac_status" >&5
+   echo "$as_me:7543: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7592,11 +7591,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7595: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7594: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7599: \$? = $ac_status" >&5
+   echo "$as_me:7598: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10392,7 +10391,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10395 "configure"
+#line 10394 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10488,7 +10487,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10491 "configure"
+#line 10490 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16529,35 +16528,17 @@ esac
 axiom_gcl_x_option="--disable-tkconfig --disable-x --disable-xgcl"
 axiom_gcl_emacs="--enable-emacs=correct"
 
-PFL=
 CCF="-O2 -Wall -D_GNU_SOURCE"
 LDF=
 LISP=lsp
 
 case $target in
     *bsd*|*dragonfly*)
-
-cat >>confdefs.h <<\_ACEOF
-#define BSDplatform /**/
-_ACEOF
-
         CCF="-O2 -Wall"
         ;;
     windows)
-
-cat >>confdefs.h <<\_ACEOF
-#define MSYSplatform /**/
-_ACEOF
-
         SRCDIRS=bootdir interpdir sharedir algebradir etcdir docdir inputdir
         ;;
-    *linux*)
-
-cat >>confdefs.h <<\_ACEOF
-#define LINUXplatform /**/
-_ACEOF
-
-        ;;
     *solaris*)
 
 cat >>confdefs.h <<\_ACEOF
@@ -16566,11 +16547,6 @@ _ACEOF
 
         ;;
     powerpc*darwin*)
-
-cat >>confdefs.h <<\_ACEOF
-#define MACOSXplatform /**/
-_ACEOF
-
         CCF="-O2 -Wall -D_GNU_SOURCE \
             -I/usr/include -I/usr/include/sys"
         axiom_gcl_bfd_option="--disable-statsysbfd \
@@ -16585,7 +16561,6 @@ GCLOPTS="$axiom_gcl_emacs $axiom_gcl_bfd_option $axiom_gcl_mm_option $axiom_gcl_
 
 
 
-
 case $axiom_lisp_flavor in
    gcl)
       void_type='void'
diff --git a/configure.ac b/configure.ac
index de64ea5d..badbecf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -593,28 +593,21 @@ esac
 axiom_gcl_x_option="--disable-tkconfig --disable-x --disable-xgcl"
 axiom_gcl_emacs="--enable-emacs=correct"
 
-PFL=
 CCF="-O2 -Wall -D_GNU_SOURCE"
 LDF=
 LISP=lsp
 
 case $target in
     *bsd*|*dragonfly*)
-        AC_DEFINE([BSDplatform], [], [BSD flavour])
         CCF="-O2 -Wall"
         ;;
     windows)
-        AC_DEFINE([MSYSplatform], [], [MS])
         SRCDIRS=bootdir interpdir sharedir algebradir etcdir docdir inputdir
         ;;
-    *linux*)
-        AC_DEFINE([LINUXplatform], [], [Linux flavour])
-        ;;
     *solaris*)
         AC_DEFINE([SUNplatform], [], [SunOS flavour])
         ;;
     powerpc*darwin*)
-        AC_DEFINE([MACOSXplatform], [], [MACOX flavour])
         CCF="-O2 -Wall -D_GNU_SOURCE \
             -I/usr/include -I/usr/include/sys"
         axiom_gcl_bfd_option="--disable-statsysbfd \
@@ -625,7 +618,6 @@ esac
 
 GCLOPTS="$axiom_gcl_emacs $axiom_gcl_bfd_option $axiom_gcl_mm_option $axiom_gcl_x_option"
 
-AC_SUBST(PLF)
 AC_SUBST(CCF)
 AC_SUBST(LDF)
 AC_SUBST(LISP)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 8147cf53..c1c42cb5 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -567,28 +567,21 @@ do with platforms.
 <<platform specific bits>>=
 <<gcl options>>
 
-PFL=
 CCF="-O2 -Wall -D_GNU_SOURCE"
 LDF=
 LISP=lsp
 
 case $target in
     *bsd*|*dragonfly*)
-        AC_DEFINE([BSDplatform], [], [BSD flavour])
 	CCF="-O2 -Wall"
 	;;
     windows)
-        AC_DEFINE([MSYSplatform], [], [MS])
 	SRCDIRS=bootdir interpdir sharedir algebradir etcdir docdir inputdir
 	;;
-    *linux*)
-        AC_DEFINE([LINUXplatform], [], [Linux flavour])
-	;;
     *solaris*)
         AC_DEFINE([SUNplatform], [], [SunOS flavour])
 	;;
     powerpc*darwin*)
-        AC_DEFINE([MACOSXplatform], [], [MACOX flavour])
 	CCF="-O2 -Wall -D_GNU_SOURCE \
 	    -I/usr/include -I/usr/include/sys"
         axiom_gcl_bfd_option="--disable-statsysbfd \
@@ -599,7 +592,6 @@ esac
 
 GCLOPTS="$axiom_gcl_emacs $axiom_gcl_bfd_option $axiom_gcl_mm_option $axiom_gcl_x_option"
 
-AC_SUBST(PLF)
 AC_SUBST(CCF)
 AC_SUBST(LDF)
 AC_SUBST(LISP)
diff --git a/src/ChangeLog b/src/ChangeLog
index 06a75817..7dc5e9a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-20  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* lib/XDither.c: Tidy.
+	* lib/XShade.c: Likewise.
+	* lib/XSpadFill.c: Likewise.
+	* lib/bsdsignal.c: Likewise.
+	* lib/edin.c: Likewise.
+	* lib/fnct_key.c: Likewise.
+	* lib/util.c: Likewise.
+	* lib/wct.c: Likewise.
+
 2009-09-19  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* boot/tokens.boot: "has" is not a keyword.
diff --git a/src/lib/XDither.c b/src/lib/XDither.c
index a16473ae..e3c15df0 100644
--- a/src/lib/XDither.c
+++ b/src/lib/XDither.c
@@ -1,6 +1,8 @@
 /*
     Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
     All rights reserved.
+    Copyright (C) Gabriel Dos Reis.
+    All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -32,7 +34,6 @@
 */
 
 #include "openaxiom-c-macros.h"
-#ifndef MSYSplatform
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -226,4 +227,3 @@ XDitherArcs(Display *display,Drawable  drawable, GC gc, XArc *arcs,int narcs)
     }
     XFillArcs(display, drawable, gc, arcs, narcs);
 }
-#endif /* MSYSplatform */
diff --git a/src/lib/XShade.c b/src/lib/XShade.c
index 8c7b6d2f..4cc052c5 100644
--- a/src/lib/XShade.c
+++ b/src/lib/XShade.c
@@ -1,6 +1,8 @@
 /*
     Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
     All rights reserved.
+    Copyright (C) Gabriel Dos Reis.
+    All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -32,7 +34,6 @@
 */
 
 #include "openaxiom-c-macros.h"
-#ifndef MSYSplatform
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -207,5 +208,4 @@ XShadeArcs(Display *display, Drawable drawable, XArc *arcs, int narcs)
     XFillArcs(display, drawable, TileGC, arcs, narcs);
 }
 
-#endif /* MSYSplatform */
 
diff --git a/src/lib/XSpadFill.c b/src/lib/XSpadFill.c
index f71a861c..1487d95b 100644
--- a/src/lib/XSpadFill.c
+++ b/src/lib/XSpadFill.c
@@ -1,6 +1,8 @@
 /*
     Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
     All rights reserved.
+    Copyright (C) Gabriel Dos Reis.
+    All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -48,7 +50,6 @@
 
 
 #include "openaxiom-c-macros.h"
-#ifndef MSYSplatform
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -296,5 +297,4 @@ XSpadFillArcs(Display *dsply, Drawable drawable,XArc *arcs, int narcs,
 }
 
 
-#endif /* MSYSplatform */
 
diff --git a/src/lib/bsdsignal.c b/src/lib/bsdsignal.c
index 86c2b068..7cb3195c 100644
--- a/src/lib/bsdsignal.c
+++ b/src/lib/bsdsignal.c
@@ -1,6 +1,8 @@
 /*
     Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
     All rights reserved.
+    Copyright (C) Gabriel Dos Reis.
+    All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -32,13 +34,7 @@
 */
 
 #include "openaxiom-c-macros.h"
-
-#if defined(MACOSXplatform)
-#include "/usr/include/signal.h"
-#else
 #include <signal.h> 
-#endif
-
 #include "bsdsignal.h"
 
 OPENAXIOM_EXPORT SignalHandlerFunc
diff --git a/src/lib/edin.c b/src/lib/edin.c
index 2e313a6a..ae4a3c0d 100644
--- a/src/lib/edin.c
+++ b/src/lib/edin.c
@@ -1,6 +1,8 @@
 /*
     Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
     All rights reserved.
+    Copyright (C) Gabriel Dos Reis.
+    All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -35,11 +37,7 @@
 
 #include <stdlib.h>
 #include "openaxiom-c-macros.h"
-#if defined(MACOSXplatform)
-#include "/usr/include/unistd.h"
-#else
 #include <unistd.h>
-#endif
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/src/lib/fnct_key.c b/src/lib/fnct_key.c
index b125fbca..d880a133 100644
--- a/src/lib/fnct_key.c
+++ b/src/lib/fnct_key.c
@@ -1,6 +1,8 @@
 /*
     Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
     All rights reserved.
+    Copyright (C) Gabriel Dos Reis.
+    All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -32,11 +34,7 @@
 */
 
 #include "openaxiom-c-macros.h"
-#if defined(MACOSXplatform)
-#include "/usr/include/unistd.h"
-#else
 #include <unistd.h>
-#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/lib/util.c b/src/lib/util.c
index b4946858..47362f7e 100644
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -1,6 +1,8 @@
 /*
     Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
     All rights reserved.
+    Copyright (C) Gabriel Dos Reis.
+    All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -32,13 +34,7 @@
 */
 
 #include "openaxiom-c-macros.h"
-
-#include <stdlib.h>
-#if defined(MACOSXplatform)
-#include "/usr/include/unistd.h"
-#else
 #include <unistd.h>
-#endif
 #include <sys/types.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/src/lib/wct.c b/src/lib/wct.c
index 03568d63..0466d84b 100644
--- a/src/lib/wct.c
+++ b/src/lib/wct.c
@@ -1,6 +1,8 @@
 /*
     Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
     All rights reserved.
+    Copyright (C) Gabriel Dos Reis.
+    All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -43,18 +45,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#if defined(MACOSXplatform)
-#include "/usr/include/unistd.h"
-#else
 #include <unistd.h>
-#endif
 #include <string.h>
 #include <fcntl.h>
-#if defined(MACOSXplatform)
-#include "/usr/include/time.h"
-#else
 #include <time.h>
-#endif
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>