1 files changed, 22 insertions, 132 deletions

diff --git a/src/h/config.h b/src/h/config.h
index bc48ada..2045dd7 100644
--- a/src/h/config.h
+++ b/src/h/config.h
@@ -9,70 +9,14 @@
 /*
  *  A number of symbols are defined here.
  *  Some enable or disable certain Icon features, for example:
- *	NoCoexpr	disables co-expressions
  *	LoadFunc	enables dynamic loading
  *
- *  Other definitions may occur for different configurations. These include:
- *	DeBug		debugging code
- *	MultiThread	support for multiple programs under the interpreter
- *
  *  Many definitions reflect remnants of past research projects.
  *  Changing them to values not used in standard configurations
  *  may result in an unbuildable or nonfunctioning system.
  */
 
 /*
- * If COMPILER is not defined, code for the interpreter is compiled.
- */
-
-#ifndef COMPILER
-   #define COMPILER 0
-#endif
-
-/*
- * The following definitions serve to cast common conditionals is
- *  a positive way, while allowing defaults for the cases that
- *  occur most frequently.  That is, if co-expressions are not supported,
- *  NoCoexpr is defined in define.h, but if they are supported, no
- *  definition is needed in define.h; nonetheless subsequent conditionals
- *  can be cast as #ifdef Coexpr.
- */
-
-#ifndef NoCoexpr
-   #undef Coexpr
-   #define Coexpr
-#endif					/* NoCoexpr */
-
-#ifdef NoCoexpr
-   #undef MultiThread
-   #undef EventMon
-   #undef Eve
-#endif					/* NoCoexpr */
-
-#if COMPILER
-   #undef Eve
-   #undef MultiThread
-   #undef EventMon
-#endif					/* COMPILER */
-
-#ifdef Eve
-   #undef EventMon
-   #undef MultiThread
-   #define EventMon
-   #define MultiThread
-#endif					/* Eve */
-
-#ifndef NoLargeInts
-   #undef LargeInts
-   #define LargeInts
-#endif					/* NoLargeInts */
-
-#ifdef EventMon
-   #undef MultiThread
-   #define MultiThread
-#endif					/* EventMon */
-
-/*
  * Graphics definitions.
  */
 #ifdef Graphics
@@ -99,14 +43,9 @@
    #undef Polling
    #define Polling
 
-   #ifndef ICONC_XLIB
-      #ifdef WinGraphics
-         #define ICONC_XLIB "-luser32 -lgdi32 -lcomdlg32 -lwinmm"
-      #else				/* WinGraphics */
-         #define ICONC_XLIB "-L/usr/X11R6/lib -lX11"
-      #endif				/* WinGraphics */
-   #endif				/* ICONC_XLIB */
-
+#else					/* Graphics */
+   #undef XWindows
+   #undef WinGraphics
 #endif					/* Graphics */
 
 /*
@@ -123,15 +62,6 @@
  * Other defaults.
  */
 
-#ifdef DeBug
-   #undef DeBugTrans
-   #undef DeBugLinker
-   #undef DeBugIconx
-   #define DeBugTrans
-   #define DeBugLinker
-   #define DeBugIconx
-#endif					/* DeBug */
-
 #ifndef MaxHdr
    /*
     * Maximum allowable BinaryHeader size.
@@ -141,7 +71,7 @@
 #endif					/* MaxHdr */
 
 #ifndef MaxPath
-   #define MaxPath 256
+   #define MaxPath 512
 #endif					/* MaxPath */
 
 #ifndef SourceSuffix
@@ -206,18 +136,10 @@
    #define DBSuffix ".db"
 #endif					/* DBSuffix */
 
-#ifndef PPInit
-   #define PPInit ""
-#endif					/* PPInit */
-
 #ifndef PPDirectives
    #define PPDirectives {"passthru", PpKeep},
 #endif					/* PPDirectives */
 
-#ifndef NoSrcColumnInfo
-   #define SrcColumnInfo
-#endif					/* NoSrcColumnInfo */
-
 #ifndef ExecSuffix
    #define ExecSuffix ""
 #endif					/* ExecSuffix */
@@ -226,66 +148,34 @@
    #define CSuffix ".c"
 #endif					/* CSuffix */
 
-#ifndef HSuffix
-   #define HSuffix ".h"
-#endif					/* HSuffix */
-
-#ifndef ObjSuffix
-   #define ObjSuffix ".o"
-#endif					/* ObjSuffix */
-
-#ifndef LibSuffix
-   #define LibSuffix ".a"
-#endif					/* LibSuffix */
-
-#ifndef CComp
-   #define CComp "cc"
-#endif					/* CComp */
-
-#ifndef COpts
-   #define COpts ""
-#endif					/* COpts */
-
 /*
  * Note, size of the hash table is a power of 2:
  */
 #define IHSize 128
 #define IHasher(x)	(((unsigned int)(unsigned long)(x))&(IHSize-1))
 
-#if COMPILER
-
-   /*
-    * Code for the compiler.
-    */
-   #undef MultiThread		/* no way -- interpreter only */
-   #undef EventMon		/* presently not supported in the compiler */
-
-#else					/* COMPILER */
-
-   /*
-    * Code for the interpreter.
-    */
-   #ifndef IcodeSuffix
-      #define IcodeSuffix ""
-   #endif				/* IcodeSuffix */
-
-   #ifndef IcodeASuffix
-      #define IcodeASuffix ""
-   #endif				/* IcodeASuffix */
+/*
+ * Code for the interpreter.
+ */
+#ifndef IcodeSuffix
+   #define IcodeSuffix ""
+#endif				/* IcodeSuffix */
 
-   #ifndef U1Suffix
-      #define U1Suffix ".u1"
-   #endif				/* U1Suffix */
+#ifndef IcodeASuffix
+   #define IcodeASuffix ""
+#endif				/* IcodeASuffix */
 
-   #ifndef U2Suffix
-      #define U2Suffix ".u2"
-   #endif				/* U2Suffix */
+#ifndef U1Suffix
+   #define U1Suffix ".u1"
+#endif				/* U1Suffix */
 
-   #ifndef USuffix
-      #define USuffix ".u"
-   #endif				/* USuffix */
+#ifndef U2Suffix
+   #define U2Suffix ".u2"
+#endif				/* U2Suffix */
 
-#endif					/* COMPILER */
+#ifndef USuffix
+   #define USuffix ".u"
+#endif				/* USuffix */
 
 /*
  *  Vsizeof is for use with variable-sized (i.e., indefinite)