Index: rules.mak
===================================================================
RCS file: /ufs/repository/magic/rules.mak,v
retrieving revision 1.3
diff -u -r1.3 rules.mak
--- rules.mak	19 Dec 2001 15:02:02 -0000	1.3
+++ rules.mak	11 Aug 2005 04:48:38 -0000
@@ -30,9 +30,9 @@
 	${RM} ${MODULE}
 	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS}
 
-${BINDIR}/${MODULE}: ${MODULE}
-	${RM} ${BINDIR}/${MODULE}
-	${CP} ${MODULE} ${BINDIR}
+${BINDIR}/${MODULE}$(PROGRAM_SUFFIX): ${MODULE}
+	${RM} $@
+	${CP} ${MODULE} $@
 
 clean:
 	${RM} ${CLEANS}
Index: calma/CalmaRdcl.c
===================================================================
RCS file: /ufs/repository/magic/calma/CalmaRdcl.c,v
retrieving revision 1.4
diff -u -r1.4 CalmaRdcl.c
--- calma/CalmaRdcl.c	23 Jul 2001 17:49:49 -0000	1.4
+++ calma/CalmaRdcl.c	11 Aug 2005 04:48:39 -0000
@@ -23,6 +23,7 @@
 
 #include <stdio.h>
 #include <sys/types.h>
+#include <string.h>
 
 #include "misc/magic.h"
 #include "utils/geometry.h"
Index: calma/CalmaWrite.c
===================================================================
RCS file: /ufs/repository/magic/calma/CalmaWrite.c,v
retrieving revision 1.5
diff -u -r1.5 CalmaWrite.c
--- calma/CalmaWrite.c	8 Oct 2002 13:45:11 -0000	1.5
+++ calma/CalmaWrite.c	11 Aug 2005 04:48:41 -0000
@@ -28,6 +28,7 @@
 #else
 #include <sys/time.h>
 #endif
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: cif/CIFmain.c
===================================================================
RCS file: /ufs/repository/magic/cif/CIFmain.c,v
retrieving revision 1.2
diff -u -r1.2 CIFmain.c
--- cif/CIFmain.c	12 Jan 2001 22:12:14 -0000	1.2
+++ cif/CIFmain.c	11 Aug 2005 04:48:44 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: cif/CIFrdtech.c
===================================================================
RCS file: /ufs/repository/magic/cif/CIFrdtech.c,v
retrieving revision 1.5
diff -u -r1.5 CIFrdtech.c
--- cif/CIFrdtech.c	23 Jul 2001 17:49:50 -0000	1.5
+++ cif/CIFrdtech.c	11 Aug 2005 04:48:46 -0000
@@ -23,9 +23,8 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#ifdef SYSV
 #include <string.h>
-#endif
+#include <strings.h>
 
 #include "misc/magic.h"
 #include "utils/geometry.h"
Index: cif/CIFwrite.c
===================================================================
RCS file: /ufs/repository/magic/cif/CIFwrite.c,v
retrieving revision 1.4
diff -u -r1.4 CIFwrite.c
--- cif/CIFwrite.c	29 Mar 2001 19:50:04 -0000	1.4
+++ cif/CIFwrite.c	11 Aug 2005 04:48:50 -0000
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: commands/CmdCD.c
===================================================================
RCS file: /ufs/repository/magic/commands/CmdCD.c,v
retrieving revision 1.5
diff -u -r1.5 CmdCD.c
--- commands/CmdCD.c	12 Jan 2001 22:12:16 -0000	1.5
+++ commands/CmdCD.c	11 Aug 2005 04:49:05 -0000
@@ -24,6 +24,7 @@
 #ifdef SYSV
 #include <string.h>
 #endif
+#include <strings.h>
 
 #include "misc/magic.h"
 #include "utils/geometry.h"
Index: commands/CmdE.c
===================================================================
RCS file: /ufs/repository/magic/commands/CmdE.c,v
retrieving revision 1.4
diff -u -r1.4 CmdE.c
--- commands/CmdE.c	12 Jan 2001 22:12:16 -0000	1.4
+++ commands/CmdE.c	11 Aug 2005 04:49:06 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/utils.h"
Index: commands/CmdRS.c
===================================================================
RCS file: /ufs/repository/magic/commands/CmdRS.c,v
retrieving revision 1.8
diff -u -r1.8 CmdRS.c
--- commands/CmdRS.c	29 Mar 2001 19:50:05 -0000	1.8
+++ commands/CmdRS.c	11 Aug 2005 04:49:14 -0000
@@ -22,9 +22,8 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#ifdef SYSV
 #include <string.h>
-#endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/stack.h"
 #include "utils/geometry.h"
Index: commands/CmdTZ.c
===================================================================
RCS file: /ufs/repository/magic/commands/CmdTZ.c,v
retrieving revision 1.7
diff -u -r1.7 CmdTZ.c
--- commands/CmdTZ.c	29 Mar 2001 19:50:05 -0000	1.7
+++ commands/CmdTZ.c	11 Aug 2005 04:49:16 -0000
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <math.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/utils.h"
Index: database/DBcellname.c
===================================================================
RCS file: /ufs/repository/magic/database/DBcellname.c,v
retrieving revision 1.4
diff -u -r1.4 DBcellname.c
--- database/DBcellname.c	23 May 2001 20:57:42 -0000	1.4
+++ database/DBcellname.c	11 Aug 2005 04:49:23 -0000
@@ -24,6 +24,7 @@
 #ifdef SYSV
 #include <string.h>
 #endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/hash.h"
 #include "utils/utils.h"
Index: database/DBcellsel.c
===================================================================
RCS file: /ufs/repository/magic/database/DBcellsel.c,v
retrieving revision 1.2
diff -u -r1.2 DBcellsel.c
--- database/DBcellsel.c	12 Jan 2001 22:12:19 -0000	1.2
+++ database/DBcellsel.c	11 Aug 2005 04:49:24 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: database/DBio.c
===================================================================
RCS file: /ufs/repository/magic/database/DBio.c,v
retrieving revision 1.5
diff -u -r1.5 DBio.c
--- database/DBio.c	7 Jun 2001 21:20:19 -0000	1.5
+++ database/DBio.c	11 Aug 2005 04:49:29 -0000
@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <sys/time.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: database/DBlabel.c
===================================================================
RCS file: /ufs/repository/magic/database/DBlabel.c,v
retrieving revision 1.4
diff -u -r1.4 DBlabel.c
--- database/DBlabel.c	23 Jul 2001 17:49:51 -0000	1.4
+++ database/DBlabel.c	11 Aug 2005 04:49:30 -0000
@@ -22,6 +22,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/malloc.h"
 #include "utils/geometry.h"
Index: database/DBlabel2.c
===================================================================
RCS file: /ufs/repository/magic/database/DBlabel2.c,v
retrieving revision 1.2
diff -u -r1.2 DBlabel2.c
--- database/DBlabel2.c	12 Jan 2001 22:12:20 -0000	1.2
+++ database/DBlabel2.c	11 Aug 2005 04:49:31 -0000
@@ -21,9 +21,9 @@
 #endif  not lint
 
 #include <stdio.h>
-#ifdef SYSV
+#include <stdlib.h>
 #include <string.h>
-#endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: database/DBmain.c
===================================================================
RCS file: /ufs/repository/magic/database/DBmain.c,v
retrieving revision 1.4
diff -u -r1.4 DBmain.c
--- database/DBmain.c	23 Aug 2001 13:48:53 -0000	1.4
+++ database/DBmain.c	11 Aug 2005 04:49:32 -0000
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/times.h>
+#include <stdlib.h>
 #include <signal.h>
 #include "misc/magic.h"
 #include "misc/magsgtty.h"
Index: database/DBtech.c
===================================================================
RCS file: /ufs/repository/magic/database/DBtech.c,v
retrieving revision 1.2
diff -u -r1.2 DBtech.c
--- database/DBtech.c	12 Jan 2001 22:12:21 -0000	1.2
+++ database/DBtech.c	11 Aug 2005 04:49:38 -0000
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/utils.h"
Index: database/DBtechname.c
===================================================================
RCS file: /ufs/repository/magic/database/DBtechname.c,v
retrieving revision 1.3
diff -u -r1.3 DBtechname.c
--- database/DBtechname.c	29 Nov 2001 20:08:51 -0000	1.3
+++ database/DBtechname.c	11 Aug 2005 04:49:39 -0000
@@ -28,6 +28,7 @@
 #ifdef SYSV
 #include <string.h>
 #endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/utils.h"
Index: database/DBtechtype.c
===================================================================
RCS file: /ufs/repository/magic/database/DBtechtype.c,v
retrieving revision 1.5
diff -u -r1.5 DBtechtype.c
--- database/DBtechtype.c	12 Jan 2001 22:12:21 -0000	1.5
+++ database/DBtechtype.c	11 Aug 2005 04:49:39 -0000
@@ -23,9 +23,8 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#ifdef SYSV
 #include <string.h>
-#endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/utils.h"
Index: database/DBundo.c
===================================================================
RCS file: /ufs/repository/magic/database/DBundo.c,v
retrieving revision 1.3
diff -u -r1.3 DBundo.c
--- database/DBundo.c	29 Mar 2001 19:50:06 -0000	1.3
+++ database/DBundo.c	11 Aug 2005 04:49:44 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/malloc.h"
 #include "utils/geometry.h"
Index: database/Makefile
===================================================================
RCS file: /ufs/repository/magic/database/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- database/Makefile	12 Jan 2001 22:12:22 -0000	1.3
+++ database/Makefile	11 Aug 2005 04:49:45 -0000
@@ -17,4 +17,8 @@
 
 LIB_OBJS += ${MAGICDIR}/tiles/libtiles.o ${MAGICDIR}/tech/libtech.o
 
+${MAGICDIR}/database/libdatabase.a: \
+	${MAGICDIR}/tiles/libtiles.o \
+	${MAGICDIR}/tiles/libtech.o
+
 include ${MAGICDIR}/rules.mak
Index: dbwind/DBWbuttons.c
===================================================================
RCS file: /ufs/repository/magic/dbwind/DBWbuttons.c,v
retrieving revision 1.2
diff -u -r1.2 DBWbuttons.c
--- dbwind/DBWbuttons.c	12 Jan 2001 22:12:23 -0000	1.2
+++ dbwind/DBWbuttons.c	11 Aug 2005 04:49:47 -0000
@@ -25,6 +25,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "graphics/graphics.h"
Index: dbwind/DBWdisplay.c
===================================================================
RCS file: /ufs/repository/magic/dbwind/DBWdisplay.c,v
retrieving revision 1.5
diff -u -r1.5 DBWdisplay.c
--- dbwind/DBWdisplay.c	29 Mar 2001 19:50:07 -0000	1.5
+++ dbwind/DBWdisplay.c	11 Aug 2005 04:49:49 -0000
@@ -23,6 +23,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "graphics/graphics.h"
Index: dbwind/DBWundo.c
===================================================================
RCS file: /ufs/repository/magic/dbwind/DBWundo.c,v
retrieving revision 1.2
diff -u -r1.2 DBWundo.c
--- dbwind/DBWundo.c	12 Jan 2001 22:12:24 -0000	1.2
+++ dbwind/DBWundo.c	11 Aug 2005 04:49:52 -0000
@@ -22,6 +22,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "windows/windows.h"
Index: drc/DRCmain.c
===================================================================
RCS file: /ufs/repository/magic/drc/DRCmain.c,v
retrieving revision 1.2
diff -u -r1.2 DRCmain.c
--- drc/DRCmain.c	12 Jan 2001 22:12:29 -0000	1.2
+++ drc/DRCmain.c	11 Aug 2005 04:53:34 -0000
@@ -35,8 +35,6 @@
 #include "drc/drc.h"
 #include "undo/undo.h"
 
-extern void TxPrintf(), TxError();
-
 /* The global variables defined below are parameters between
  * the DRC error routines (drcPaintError and drcPrintError)
  * and the higher-level routines that start up DRC error checks.
Index: drc/DRCprint.c
===================================================================
RCS file: /ufs/repository/magic/drc/DRCprint.c,v
retrieving revision 1.2
diff -u -r1.2 DRCprint.c
--- drc/DRCprint.c	12 Jan 2001 22:12:29 -0000	1.2
+++ drc/DRCprint.c	11 Aug 2005 04:53:35 -0000
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <sys/types.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: ext2sim/Makefile
===================================================================
RCS file: /ufs/repository/magic/ext2sim/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ext2sim/Makefile	12 Jan 2001 22:12:31 -0000	1.3
+++ ext2sim/Makefile	11 Aug 2005 04:53:46 -0000
@@ -14,6 +14,6 @@
 
 main: ext2sim
 
-install: ${BINDIR}/ext2sim 
+install: ${BINDIR}/ext2sim$(PROGRAM_SUFFIX)
 
 include ${MAGICDIR}/rules.mak
Index: ext2sim/ext2sim.c
===================================================================
RCS file: /ufs/repository/magic/ext2sim/ext2sim.c,v
retrieving revision 1.5
diff -u -r1.5 ext2sim.c
--- ext2sim/ext2sim.c	6 Jul 2001 17:58:30 -0000	1.5
+++ ext2sim/ext2sim.c	11 Aug 2005 04:53:47 -0000
@@ -19,7 +19,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <varargs.h>
+#include <stdarg.h>
+#include <string.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/hash.h"
Index: ext2spice/Makefile
===================================================================
RCS file: /ufs/repository/magic/ext2spice/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ext2spice/Makefile	12 Jan 2001 22:12:32 -0000	1.3
+++ ext2spice/Makefile	11 Aug 2005 04:53:50 -0000
@@ -14,10 +14,11 @@
 
 main: ext2spice
 
-install: ${BINDIR}/ext2spice ${BINDIR}/spice2sim 
+install: ${BINDIR}/ext2spice$(PROGRAM_SUFFIX) \
+	${BINDIR}/spice2sim$(PROGRAM_SUFFIX)
 
-${BINDIR}/spice2sim: spice2sim
-	${RM} ${BINDIR}/spice2sim
-	${CP} spice2sim ${BINDIR}/spice2sim
+${BINDIR}/spice2sim$(PROGRAM_SUFFIX): spice2sim
+	${RM} $@
+	${CP} spice2sim $@
 
 include ${MAGICDIR}/rules.mak
Index: ext2spice/ext2spice.c
===================================================================
RCS file: /ufs/repository/magic/ext2spice/ext2spice.c,v
retrieving revision 1.4
diff -u -r1.4 ext2spice.c
--- ext2spice/ext2spice.c	4 Dec 2001 21:44:14 -0000	1.4
+++ ext2spice/ext2spice.c	11 Aug 2005 04:53:52 -0000
@@ -18,7 +18,10 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <varargs.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/malloc.h"
 #include "utils/geometry.h"
@@ -1586,27 +1589,24 @@
 }
 
 /* debugging stuff */
-#include <varargs.h>
+#include <stdarg.h>
 
 #define DBG 1
 
-DBPRINT( va_alist )
-  va_dcl
-  {
-    va_list  args;
-    char     *fmt;
-    FILE     *fp;
-    char     buff[ 300 ];
+void
+DBPRINT(FILE* fp, char* fmt, ... )
+{
+  va_list  args;
+  char     buff[ 300 ];
 
-    if ( DBG ) {
-    va_start( args );
+  if ( DBG ) {
+    va_start( args, fmt );
     fp = stderr ;
-    fmt = va_arg( args, char * );
     (void) vsprintf( buff, fmt, args );
     va_end( args );
 
     (void) fputs( buff, fp );
 
-    }
   }
+}
 
Index: extcheck/Makefile
===================================================================
RCS file: /ufs/repository/magic/extcheck/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- extcheck/Makefile	12 Jan 2001 22:12:33 -0000	1.3
+++ extcheck/Makefile	11 Aug 2005 04:53:53 -0000
@@ -14,6 +14,6 @@
 
 main: extcheck
 
-install: ${BINDIR}/extcheck
+install: ${BINDIR}/extcheck$(PROGRAM_SUFFIX)
 
 include ${MAGICDIR}/rules.mak
Index: extcheck/extcheck.c
===================================================================
RCS file: /ufs/repository/magic/extcheck/extcheck.c,v
retrieving revision 1.2
diff -u -r1.2 extcheck.c
--- extcheck/extcheck.c	12 Jan 2001 22:12:34 -0000	1.2
+++ extcheck/extcheck.c	11 Aug 2005 04:53:53 -0000
@@ -28,7 +28,8 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <varargs.h>
+#include <stdarg.h>
+#include <stdlib.h>
 #include "misc/magic.h"
 #include "misc/paths.h"
 #include "utils/geometry.h"
Index: extflat/EFargs.c
===================================================================
RCS file: /ufs/repository/magic/extflat/EFargs.c,v
retrieving revision 1.2
diff -u -r1.2 EFargs.c
--- extflat/EFargs.c	12 Jan 2001 22:12:34 -0000	1.2
+++ extflat/EFargs.c	11 Aug 2005 04:53:53 -0000
@@ -24,10 +24,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <varargs.h>
-#ifdef SYSV
+#include <stdarg.h>
 #include <string.h>
-#endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "misc/paths.h"
 #include "utils/geometry.h"
Index: extflat/EFbuild.c
===================================================================
RCS file: /ufs/repository/magic/extflat/EFbuild.c,v
retrieving revision 1.2
diff -u -r1.2 EFbuild.c
--- extflat/EFbuild.c	12 Jan 2001 22:12:34 -0000	1.2
+++ extflat/EFbuild.c	11 Aug 2005 04:53:55 -0000
@@ -22,9 +22,8 @@
 #endif  not lint
 
 #include <stdio.h>
-#ifdef SYSV
 #include <string.h>
-#endif
+#include <stdlib.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/hash.h"
Index: extflat/EFflat.c
===================================================================
RCS file: /ufs/repository/magic/extflat/EFflat.c,v
retrieving revision 1.2
diff -u -r1.2 EFflat.c
--- extflat/EFflat.c	12 Jan 2001 22:12:35 -0000	1.2
+++ extflat/EFflat.c	11 Aug 2005 04:53:56 -0000
@@ -23,6 +23,8 @@
 
 #include <stdio.h>
 #include <math.h>
+#include <string.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/geofast.h"
Index: extflat/EFname.c
===================================================================
RCS file: /ufs/repository/magic/extflat/EFname.c,v
retrieving revision 1.4
diff -u -r1.4 EFname.c
--- extflat/EFname.c	6 Jul 2001 17:58:39 -0000	1.4
+++ extflat/EFname.c	11 Aug 2005 04:53:58 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
Index: extflat/EFread.c
===================================================================
RCS file: /ufs/repository/magic/extflat/EFread.c,v
retrieving revision 1.2
diff -u -r1.2 EFread.c
--- extflat/EFread.c	12 Jan 2001 22:12:35 -0000	1.2
+++ extflat/EFread.c	11 Aug 2005 04:53:58 -0000
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <varargs.h>
+#include <stdarg.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/hash.h"
@@ -33,6 +33,10 @@
 #include "extflat/EFint.h"
 #include "misc/paths.h"
 
+// extern (public)
+void
+efReadError(char* fmt, ...);
+
 /*
  * The following table describes the kinds of lines
  * that may be read in a .ext file.
@@ -534,14 +538,13 @@
  */
 
     /*VARARGS1*/
-efReadError(fmt, va_alist)
-    char *fmt;
-    va_dcl
+void
+efReadError(char* fmt, ...)
 {
     va_list args;
 
     (void) printf("%s, line %d: ", efReadFileName, efReadLineNum);
-    va_start(args);
+    va_start(args, fmt);
     vfprintf(stdout, fmt, args);
     va_end(args);
     (void) fflush(stdout);
Index: extflat/EFsym.c
===================================================================
RCS file: /ufs/repository/magic/extflat/EFsym.c,v
retrieving revision 1.2
diff -u -r1.2 EFsym.c
--- extflat/EFsym.c	12 Jan 2001 22:12:35 -0000	1.2
+++ extflat/EFsym.c	11 Aug 2005 04:53:59 -0000
@@ -33,6 +33,7 @@
 #ifdef SYSV
 #include <string.h>
 #endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/geofast.h"
Index: extract/ExtArray.c
===================================================================
RCS file: /ufs/repository/magic/extract/ExtArray.c,v
retrieving revision 1.3
diff -u -r1.3 ExtArray.c
--- extract/ExtArray.c	23 Jul 2001 17:49:51 -0000	1.3
+++ extract/ExtArray.c	11 Aug 2005 04:54:01 -0000
@@ -23,6 +23,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/geofast.h"
Index: extract/ExtBasic.c
===================================================================
RCS file: /ufs/repository/magic/extract/ExtBasic.c,v
retrieving revision 1.8
diff -u -r1.8 ExtBasic.c
--- extract/ExtBasic.c	5 Dec 2001 15:20:08 -0000	1.8
+++ extract/ExtBasic.c	11 Aug 2005 04:54:02 -0000
@@ -22,6 +22,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
Index: extract/ExtCell.c
===================================================================
RCS file: /ufs/repository/magic/extract/ExtCell.c,v
retrieving revision 1.2
diff -u -r1.2 ExtCell.c
--- extract/ExtCell.c	12 Jan 2001 22:12:37 -0000	1.2
+++ extract/ExtCell.c	11 Aug 2005 04:54:03 -0000
@@ -23,9 +23,8 @@
 
 #include <stdio.h>
 #include <math.h>
-#ifdef SYSV
 #include <string.h>
-#endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "misc/styles.h"
Index: extract/ExtHard.c
===================================================================
RCS file: /ufs/repository/magic/extract/ExtHard.c,v
retrieving revision 1.2
diff -u -r1.2 ExtHard.c
--- extract/ExtHard.c	12 Jan 2001 22:12:37 -0000	1.2
+++ extract/ExtHard.c	11 Aug 2005 04:54:05 -0000
@@ -24,6 +24,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: extract/ExtLength.c
===================================================================
RCS file: /ufs/repository/magic/extract/ExtLength.c,v
retrieving revision 1.2
diff -u -r1.2 ExtLength.c
--- extract/ExtLength.c	12 Jan 2001 22:12:37 -0000	1.2
+++ extract/ExtLength.c	11 Aug 2005 04:54:07 -0000
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <ctype.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/geofast.h"
Index: extract/ExtTech.c
===================================================================
RCS file: /ufs/repository/magic/extract/ExtTech.c,v
retrieving revision 1.4
diff -u -r1.4 ExtTech.c
--- extract/ExtTech.c	15 May 2003 14:37:30 -0000	1.4
+++ extract/ExtTech.c	11 Aug 2005 04:54:12 -0000
@@ -24,9 +24,8 @@
 
 #include <stdio.h>
 #include <math.h>
-#ifdef SYSV
 #include <string.h>
-#endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/utils.h"
 #include "utils/geometry.h"
Index: extract/ExtTimes.c
===================================================================
RCS file: /ufs/repository/magic/extract/ExtTimes.c,v
retrieving revision 1.4
diff -u -r1.4 ExtTimes.c
--- extract/ExtTimes.c	23 Jul 2001 17:49:52 -0000	1.4
+++ extract/ExtTimes.c	11 Aug 2005 04:54:14 -0000
@@ -29,6 +29,7 @@
 #include <sys/param.h>
 #include <sys/times.h>
 #endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/utils.h"
 #include "utils/geometry.h"
Index: extract/ExtUnique.c
===================================================================
RCS file: /ufs/repository/magic/extract/ExtUnique.c,v
retrieving revision 1.3
diff -u -r1.3 ExtUnique.c
--- extract/ExtUnique.c	9 Mar 2001 23:29:48 -0000	1.3
+++ extract/ExtUnique.c	11 Aug 2005 04:54:14 -0000
@@ -23,9 +23,8 @@
 
 #include <stdio.h>
 #include <math.h>
-#ifdef SYSV
 #include <string.h>
-#endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "misc/styles.h"
Index: extract/ExtYank.c
===================================================================
RCS file: /ufs/repository/magic/extract/ExtYank.c,v
retrieving revision 1.2
diff -u -r1.2 ExtYank.c
--- extract/ExtYank.c	12 Jan 2001 22:12:38 -0000	1.2
+++ extract/ExtYank.c	11 Aug 2005 04:54:14 -0000
@@ -23,6 +23,8 @@
 
 #include <stdio.h>
 #include <math.h>
+#include <string.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/geofast.h"
Index: gcr/gcrChannel.c
===================================================================
RCS file: /ufs/repository/magic/gcr/gcrChannel.c,v
retrieving revision 1.2
diff -u -r1.2 gcrChannel.c
--- gcr/gcrChannel.c	12 Jan 2001 22:12:42 -0000	1.2
+++ gcr/gcrChannel.c	11 Aug 2005 04:54:44 -0000
@@ -24,6 +24,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "gcr/gcr.h"
Index: graphics/X11Helper.c
===================================================================
RCS file: /ufs/repository/magic/graphics/X11Helper.c,v
retrieving revision 1.10
diff -u -r1.10 X11Helper.c
--- graphics/X11Helper.c	23 Aug 2001 13:48:53 -0000	1.10
+++ graphics/X11Helper.c	11 Aug 2005 04:54:49 -0000
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <sys/time.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
Index: graphics/grMain.c
===================================================================
RCS file: /ufs/repository/magic/graphics/grMain.c,v
retrieving revision 1.8
diff -u -r1.8 grMain.c
--- graphics/grMain.c	13 Apr 2001 20:02:59 -0000	1.8
+++ graphics/grMain.c	11 Aug 2005 04:54:56 -0000
@@ -92,6 +92,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <errno.h>
@@ -120,7 +121,7 @@
 #endif	sun
 
 #ifndef	NO_VARARGS
-#include <varargs.h>
+#include <stdarg.h>
 #endif	NO_VARARGS
 
 extern char *getenv();
Index: graphics/grNull.c
===================================================================
RCS file: /ufs/repository/magic/graphics/grNull.c,v
retrieving revision 1.5
diff -u -r1.5 grNull.c
--- graphics/grNull.c	12 Jan 2001 22:12:46 -0000	1.5
+++ graphics/grNull.c	11 Aug 2005 04:54:57 -0000
@@ -18,6 +18,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magsgtty.h"
 
 #include "misc/magic.h"
Index: graphics/grX11su1.c
===================================================================
RCS file: /ufs/repository/magic/graphics/grX11su1.c,v
retrieving revision 1.10
diff -u -r1.10 grX11su1.c
--- graphics/grX11su1.c	19 Jun 2002 14:06:36 -0000	1.10
+++ graphics/grX11su1.c	11 Aug 2005 04:55:06 -0000
@@ -29,6 +29,8 @@
 #include <sys/types.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <signal.h>
 
 #include "misc/magic.h"
Index: graphics/grX11su3.c
===================================================================
RCS file: /ufs/repository/magic/graphics/grX11su3.c,v
retrieving revision 1.3
diff -u -r1.3 grX11su3.c
--- graphics/grX11su3.c	29 Mar 2001 19:50:09 -0000	1.3
+++ graphics/grX11su3.c	11 Aug 2005 04:55:08 -0000
@@ -19,6 +19,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <X11/Xlib.h>
 
 #include "misc/magic.h"
Index: grouter/grouteCrss.c
===================================================================
RCS file: /ufs/repository/magic/grouter/grouteCrss.c,v
retrieving revision 1.2
diff -u -r1.2 grouteCrss.c
--- grouter/grouteCrss.c	12 Jan 2001 22:12:51 -0000	1.2
+++ grouter/grouteCrss.c	11 Aug 2005 04:55:15 -0000
@@ -22,6 +22,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/geofast.h"
Index: grouter/grouteDens.c
===================================================================
RCS file: /ufs/repository/magic/grouter/grouteDens.c,v
retrieving revision 1.2
diff -u -r1.2 grouteDens.c
--- grouter/grouteDens.c	12 Jan 2001 22:12:51 -0000	1.2
+++ grouter/grouteDens.c	11 Aug 2005 04:55:15 -0000
@@ -21,6 +21,7 @@
 #endif	lint
 
 #include <stdio.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/hash.h"
Index: grouter/grouteTest.c
===================================================================
RCS file: /ufs/repository/magic/grouter/grouteTest.c,v
retrieving revision 1.2
diff -u -r1.2 grouteTest.c
--- grouter/grouteTest.c	12 Jan 2001 22:12:52 -0000	1.2
+++ grouter/grouteTest.c	11 Aug 2005 04:55:23 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/hash.h"
Index: irouter/irCommand.c
===================================================================
RCS file: /ufs/repository/magic/irouter/irCommand.c,v
retrieving revision 1.2
diff -u -r1.2 irCommand.c
--- irouter/irCommand.c	12 Jan 2001 22:12:53 -0000	1.2
+++ irouter/irCommand.c	11 Aug 2005 04:55:26 -0000
@@ -27,6 +27,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/hash.h"
Index: irouter/irRoute.c
===================================================================
RCS file: /ufs/repository/magic/irouter/irRoute.c,v
retrieving revision 1.2
diff -u -r1.2 irRoute.c
--- irouter/irRoute.c	12 Jan 2001 22:12:53 -0000	1.2
+++ irouter/irRoute.c	11 Aug 2005 04:55:28 -0000
@@ -24,6 +24,7 @@
 /* --- Includes --- */
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/hash.h"
Index: lisp/lispA-Z.c
===================================================================
RCS file: /ufs/repository/magic/lisp/lispA-Z.c,v
retrieving revision 1.2
diff -u -r1.2 lispA-Z.c
--- lisp/lispA-Z.c	12 Jan 2001 22:12:54 -0000	1.2
+++ lisp/lispA-Z.c	11 Aug 2005 04:55:30 -0000
@@ -22,6 +22,7 @@
  *************************************************************************/
 
 #include <stdio.h>
+#include <string.h>
 
 #include "lisp/lisp.h"
 #include "lispInt.h"
Index: lisp/lispEval.c
===================================================================
RCS file: /ufs/repository/magic/lisp/lispEval.c,v
retrieving revision 1.3
diff -u -r1.3 lispEval.c
--- lisp/lispEval.c	12 Jan 2001 22:12:54 -0000	1.3
+++ lisp/lispEval.c	11 Aug 2005 04:55:31 -0000
@@ -22,6 +22,7 @@
  *************************************************************************/
 
 #include <stdio.h>
+#include <string.h>
 
 #include "lisp/lisp.h"
 #include "lispInt.h"
Index: lisp/lispGC.c
===================================================================
RCS file: /ufs/repository/magic/lisp/lispGC.c,v
retrieving revision 1.2
diff -u -r1.2 lispGC.c
--- lisp/lispGC.c	12 Jan 2001 22:12:54 -0000	1.2
+++ lisp/lispGC.c	11 Aug 2005 04:55:32 -0000
@@ -23,6 +23,7 @@
  *************************************************************************/
 
 #include <stdio.h>
+#include <string.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 
Index: lisp/lispIO.c
===================================================================
RCS file: /ufs/repository/magic/lisp/lispIO.c,v
retrieving revision 1.3
diff -u -r1.3 lispIO.c
--- lisp/lispIO.c	23 Aug 2001 13:48:54 -0000	1.3
+++ lisp/lispIO.c	11 Aug 2005 04:55:32 -0000
@@ -23,6 +23,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "lisp/lisp.h"
 #include "lispInt.h"
Index: lisp/lispMagic.c
===================================================================
RCS file: /ufs/repository/magic/lisp/lispMagic.c,v
retrieving revision 1.2
diff -u -r1.2 lispMagic.c
--- lisp/lispMagic.c	12 Jan 2001 22:12:55 -0000	1.2
+++ lisp/lispMagic.c	11 Aug 2005 04:55:33 -0000
@@ -23,6 +23,8 @@
  *************************************************************************/
 
 #include <stdio.h>
+#include <string.h>
+#include <strings.h>
 
 #include "lisp/lisp.h"
 #include "lispInt.h"
Index: lisp/lispMain.c
===================================================================
RCS file: /ufs/repository/magic/lisp/lispMain.c,v
retrieving revision 1.3
diff -u -r1.3 lispMain.c
--- lisp/lispMain.c	3 Oct 2001 22:52:13 -0000	1.3
+++ lisp/lispMain.c	11 Aug 2005 04:55:34 -0000
@@ -22,6 +22,7 @@
  *************************************************************************/
 
 #include <stdio.h>
+#include <string.h>
 
 #include "lisp/lisp.h"
 #include "lispInt.h"
Index: lisp/lispParse.c
===================================================================
RCS file: /ufs/repository/magic/lisp/lispParse.c,v
retrieving revision 1.3
diff -u -r1.3 lispParse.c
--- lisp/lispParse.c	12 Jan 2001 22:12:55 -0000	1.3
+++ lisp/lispParse.c	11 Aug 2005 04:55:35 -0000
@@ -22,6 +22,7 @@
  *************************************************************************/
 
 #include <stdio.h>
+#include <string.h>
 #include <ctype.h>
 
 #include "lisp/lisp.h"
Index: lisp/lispString.c
===================================================================
RCS file: /ufs/repository/magic/lisp/lispString.c,v
retrieving revision 1.2
diff -u -r1.2 lispString.c
--- lisp/lispString.c	12 Jan 2001 22:12:55 -0000	1.2
+++ lisp/lispString.c	11 Aug 2005 04:55:35 -0000
@@ -22,6 +22,7 @@
  *************************************************************************/
 
 #include <stdio.h>
+#include <string.h>
 
 #include "lisp/lisp.h"
 #include "lispInt.h"
Index: macros/macros.c
===================================================================
RCS file: /ufs/repository/magic/macros/macros.c,v
retrieving revision 1.6
diff -u -r1.6 macros.c
--- macros/macros.c	26 Sep 2001 18:24:39 -0000	1.6
+++ macros/macros.c	11 Aug 2005 04:55:57 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include <signal.h>
 #ifdef XLIB
 #include <X11/X.h>
Index: magic/Makefile
===================================================================
RCS file: /ufs/repository/magic/magic/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- magic/Makefile	26 Sep 2001 18:24:39 -0000	1.7
+++ magic/Makefile	11 Aug 2005 04:55:57 -0000
@@ -32,7 +32,8 @@
 
 main: magic
 
-install: ${BINDIR}/magic ${SYSDIR}/.magic ${SYSDIR}/magicps.pro
+install: ${BINDIR}/magic$(PROGRAM_SUFFIX) \
+	${SYSDIR}/.magic ${SYSDIR}/magicps.pro
 
 ${SYSDIR}/.magic: proto.magic
 	${RM} ${SYSDIR}/.magic
Index: magic/proto.magic
===================================================================
RCS file: /ufs/repository/magic/magic/proto.magic,v
retrieving revision 1.4
diff -u -r1.4 proto.magic
--- magic/proto.magic	26 Sep 2001 18:24:39 -0000	1.4
+++ magic/proto.magic	11 Aug 2005 04:55:58 -0000
@@ -1,12 +1,16 @@
+#if 0
 #	$(CAD_HOME)/lib/sys/.magic 
 # 	System wide start up file for magic, defines default macros.
 #
 #	rcsid $Header: /ufs/repository/magic/magic/proto.magic,v 1.4 2001/09/26 18:24:39 tim Exp $
 #
+#endif
 #ifndef USE_NEW_MACROS
+#if 0
 ###############################################################################
 #  Default .magic macro file (original)
 ###############################################################################
+#endif
 echo ""
 macro s "select"
 macro S "select more"
@@ -50,103 +54,155 @@
 macro '' "iroute route -dBox"
 macro '' "iroute route -dSelection"
 #else	(USE_NEW_MACROS)
+#if 0
 ###############################################################################
 #  Default .magic macro file (new macros)
 ###############################################################################
 # A key
+#endif
 macro a "select visible"
 macro A "select more visible"
 macro '
' "select less visible"
+#if 0
 # B key
+#endif
 macro b "box"
 macro B "findbox"
+#if 0
 # C key
+#endif
 macro c "copy"
+#if 0
 # D key
+#endif
 macro d "delete"
 macro '' "erase $"
+#if 0
 # E key
+#endif
 macro e "edit"
+#if 0
 # F key
+#endif
 macro f "sideways"
 macro F "upsidedown"
+#if 0
 # G key
+#endif
 macro g "grid"
 macro G "grid 2"
+#if 0
 # I key
+#endif
 macro i "select cell"
 macro I "select more cell"
 #ifdef XLIB
 macro Control_XK_i "select less cell"
 #endif
+#if 0
 # L key
+#endif
 #ifdef USE_READLINE
 imacro l "label "
 #endif
 macro L "shell ls"
 macro '' "redraw"
+#if 0
 # M key
+#endif
 macro m "move"
 macro M "stretch"
+#if 0
 # N key
+#endif
 macro '' ""
+#if 0
 # O key
+#endif
 macro o "openwindow"
 macro O "closewindow"
+#if 0
 # P key
+#endif
 #ifdef USE_READLINE
 imacro p "paint "
 #endif
+#if 0
 # Q key
+#endif
 #ifdef XLIB
 macro Control_Shift_XK_q "quit"
 #endif
+#if 0
 # R key
+#endif
 macro r "clockwise"
 macro R "clockwise 270"
 macro '' "clockwise 180"
+#if 0
 # S key
+#endif
 macro s "select"
 macro S "select more"
 macro '' "select less"
 #ifdef XLIB
 macro Control_Shift_XK_s "undo ; select"
 #endif
+#if 0
 # U key
+#endif
 macro u "undo"
 macro U "redo"
+#if 0
 # V key
+#endif
 macro v "view"
 macro V "xview"
+#if 0
 # W key
+#endif
 macro w "writeall"
 macro W "writeall force"
+#if 0
 # X key
+#endif
 macro x "expand"
 macro X "unexpand"
 macro '' "expand toggle"
+#if 0
 # Z key
+#endif
 macro z "zoom .5"
 macro Z "zoom 2"
 macro '' "findbox zoom"
 #ifdef XLIB
 macro Control_Shift_XK_z "center"
 #endif
+#if 0
 # Question mark
+#endif
 macro ? "drc why"
 macro / "select area; what ; select clear"
+#if 0
 # Comma key
+#endif
 macro , "select clear"
+#if 0
 # Exclamation mark
+#endif
 #ifdef USE_READLINE
 imacro ! "shell "
 #endif
+#if 0
 # Space bar
+#endif
 macro " " "tool"
 #ifdef XLIB
 macro Shift_XK_space "tool box"
 macro Control_XK_space "tool wiring"
+#if 0
 # Arrow keys (X11 versions only)
+#endif
 macro XK_Left "scroll l .1"
 macro Shift_XK_Left "scroll l 1"
 macro Control_XK_Left "box +l 1"
@@ -163,8 +219,10 @@
 macro Shift_XK_Down "scroll d 1"
 macro Control_XK_Down "box +d 1"
 macro Control_Shift_XK_Down "box -u 1"
+#if 0
 # Keypad keys (X11 versions only)
 # Functions duplicated for use both with Num_Lock ON and OFF
+#endif
 macro XK_KP_Delete "box w 0; box h 0"
 macro XK_KP_0 "box w 4; box h 4"
 macro XK_KP_Insert "box w 4; box h 4"
@@ -208,7 +266,9 @@
 macro XK_KP_Prior "move r 1; move u 1"
 macro Shift_XK_KP_9 "stretch r 1; stretch u 1"
 macro XK_9 "stretch r 1; stretch u 1"
+#if 0
 # Quick macro function keys for scmos tech (X11 versions only)
+#endif
 macro XK_F1  "paint ndiff"
 macro XK_F2  "paint pdiff"
 macro XK_F3  "paint poly"
@@ -224,16 +284,16 @@
 #endif
 #endif	(USE_NEW_MACROS)
 #ifndef NO_PLOT
-#
+#if 0
 # additions for plot package
-#
+#endif
 plot parameter spoolCommand "echo use 'lpr -P%s -v -s -JMagic %s' to print plot"
 plot parameter directory "."
 #endif	(NO_PLOT)
 #ifndef NO_SCHEME_INTERPRETER
-#
+#if 0
 # additions for default scm path
-#
+#endif
 define scm-library-path "~cad/lib/magic/scm"
 load-scm "default.scm"
 load-scm "layout.scm"
Index: magicusage/Makefile
===================================================================
RCS file: /ufs/repository/magic/magicusage/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- magicusage/Makefile	12 Jan 2001 22:12:58 -0000	1.3
+++ magicusage/Makefile	11 Aug 2005 04:55:58 -0000
@@ -12,6 +12,6 @@
 
 main: magicusage
 
-install: ${BINDIR}/magicusage
+install: ${BINDIR}/magicusage$(PROGRAM_SUFFIX)
 
 include ${MAGICDIR}/rules.mak
Index: magicusage/magicusage.c
===================================================================
RCS file: /ufs/repository/magic/magicusage/magicusage.c,v
retrieving revision 1.2
diff -u -r1.2 magicusage.c
--- magicusage/magicusage.c	12 Jan 2001 22:12:58 -0000	1.2
+++ magicusage/magicusage.c	11 Aug 2005 04:55:58 -0000
@@ -29,6 +29,8 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "misc/magic.h"
 #include "misc/paths.h"
Index: misc/magic.h
===================================================================
RCS file: /ufs/repository/magic/misc/magic.h,v
retrieving revision 1.5
diff -u -r1.5 magic.h
--- misc/magic.h	23 Aug 2001 13:48:54 -0000	1.5
+++ misc/magic.h	11 Aug 2005 04:55:59 -0000
@@ -203,6 +203,10 @@
 #define	IS_LITTLE_ENDIAN	/* Digital Alpha AXP */
 #endif
 
+#ifdef	__APPLE__
+#define	IS_BIG_ENDIAN
+#endif
+
 /* Well, how'd we do? */
 
 #if	!defined(IS_BIG_ENDIAN) && !defined(IS_LITTLE_ENDIAN)
@@ -285,7 +289,7 @@
 #include <errno.h>
 #define sys_errlist _sys_errlist
 #define sys_nerr _sys_nerr
-#elif !defined(__FreeBSD__) && !defined(__NetBSD__)
+#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__APPLE__)
 extern int errno;
 /* extern char *sys_errlist[]; */
 extern int sys_nerr;
Index: misc/niceabort.c
===================================================================
RCS file: /ufs/repository/magic/misc/niceabort.c,v
retrieving revision 1.2
diff -u -r1.2 niceabort.c
--- misc/niceabort.c	12 Jan 2001 22:13:00 -0000	1.2
+++ misc/niceabort.c	11 Aug 2005 04:55:59 -0000
@@ -22,6 +22,8 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <signal.h>
 #include <sys/types.h>
 #include "misc/magic.h"
Index: misc/patchlevel.c
===================================================================
RCS file: /ufs/repository/magic/misc/patchlevel.c,v
retrieving revision 1.2
diff -u -r1.2 patchlevel.c
--- misc/patchlevel.c	12 Jan 2001 22:13:00 -0000	1.2
+++ misc/patchlevel.c	11 Aug 2005 04:56:00 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "misc/patchlevel.h"
 
Index: mpack/magicMain.c
===================================================================
RCS file: /ufs/repository/magic/mpack/magicMain.c,v
retrieving revision 1.3
diff -u -r1.3 magicMain.c
--- mpack/magicMain.c	12 Jan 2001 22:13:00 -0000	1.3
+++ mpack/magicMain.c	11 Aug 2005 04:56:00 -0000
@@ -24,6 +24,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/times.h>
+#include <string.h>
+#include <stdlib.h>
 #include "misc/magic.h"
 #include "misc/magsgtty.h"	
 #include "utils/hash.h"
Index: mpack/magicStubs.c
===================================================================
RCS file: /ufs/repository/magic/mpack/magicStubs.c,v
retrieving revision 1.2
diff -u -r1.2 magicStubs.c
--- mpack/magicStubs.c	12 Jan 2001 22:13:00 -0000	1.2
+++ mpack/magicStubs.c	11 Aug 2005 04:56:00 -0000
@@ -14,6 +14,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <stdarg.h>
 #include "misc/magic.h"
 #include "utils/hash.h"
 #include "utils/geometry.h"
@@ -52,6 +53,30 @@
 
  
 /* TEXTIO */
+
+#ifndef	NO_VARARGS
+/*VARARGS1*/
+void
+TxError(char* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    (void) fflush(stdout);
+    (void) fprintf(stderr, format, args);
+    (void) fflush(stderr);
+    va_end(args);
+}
+
+/*VARARGS1*/
+void
+TxPrintf(char* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    (void) fprintf(stdout, format, args);
+    va_end(args);
+}
+#else	/* NO_VARARGS */
 /*VARARGS1*/
 void
 TxError(format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
@@ -71,6 +96,7 @@
     (void) fprintf(stdout, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
 	a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
 }
+#endif
 
 void
 TxFlush()
Index: mpack/mpackMain.c
===================================================================
RCS file: /ufs/repository/magic/mpack/mpackMain.c,v
retrieving revision 1.3
diff -u -r1.3 mpackMain.c
--- mpack/mpackMain.c	6 Feb 2001 17:45:30 -0000	1.3
+++ mpack/mpackMain.c	11 Aug 2005 04:56:02 -0000
@@ -18,6 +18,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/hash.h"
 #include "utils/geometry.h"
Index: net2ir/Makefile
===================================================================
RCS file: /ufs/repository/magic/net2ir/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net2ir/Makefile	12 Jan 2001 22:13:05 -0000	1.3
+++ net2ir/Makefile	11 Aug 2005 04:56:22 -0000
@@ -12,6 +12,6 @@
 
 main: net2ir
 
-install: ${BINDIR}/net2ir
+install: ${BINDIR}/net2ir$(PROGRAM_SUFFIX)
 
 include ${MAGICDIR}/rules.mak
Index: net2ir/net2ir.c
===================================================================
RCS file: /ufs/repository/magic/net2ir/net2ir.c,v
retrieving revision 1.3
diff -u -r1.3 net2ir.c
--- net2ir/net2ir.c	12 Jan 2001 22:13:05 -0000	1.3
+++ net2ir/net2ir.c	11 Aug 2005 04:56:22 -0000
@@ -20,6 +20,7 @@
 #else
 #include <strings.h>
 #endif
+#include <stdlib.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/hash.h"
Index: netlist/netlist.c
===================================================================
RCS file: /ufs/repository/magic/netlist/netlist.c,v
retrieving revision 1.5
diff -u -r1.5 netlist.c
--- netlist/netlist.c	23 Aug 2001 13:48:55 -0000	1.5
+++ netlist/netlist.c	11 Aug 2005 04:56:22 -0000
@@ -23,6 +23,10 @@
 #endif	lint
 
 #include <stdio.h>
+#if defined(__APPLE__)
+#include <mach-o/getsect.h>
+#endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/hash.h"
@@ -366,6 +370,8 @@
     static char tempId[100];
 #if defined(linux) || defined(CYGWIN)
     extern int etext asm("etext");
+#elif defined(__APPLE__)
+    // nothing, use get_etext(), as defined in <mach-o/getsect.h>
 #else
     extern int etext;
 #endif
@@ -375,7 +381,11 @@
 	return "(NULL)";
 
     /* Handle case of small integers, for debugging the channel router */
+#if defined(__APPLE__)
+    if ((unsigned long) net <= get_etext())
+#else
     if (net <= (NLNet *)(&etext))
+#endif
     {
 	(void) sprintf(tempId, "#%d", net);
 	return tempId;
Index: netmenu/NMbutton.c
===================================================================
RCS file: /ufs/repository/magic/netmenu/NMbutton.c,v
retrieving revision 1.2
diff -u -r1.2 NMbutton.c
--- netmenu/NMbutton.c	12 Jan 2001 22:13:06 -0000	1.2
+++ netmenu/NMbutton.c	11 Aug 2005 04:56:23 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "graphics/graphics.h"
Index: netmenu/NMlabel.c
===================================================================
RCS file: /ufs/repository/magic/netmenu/NMlabel.c,v
retrieving revision 1.2
diff -u -r1.2 NMlabel.c
--- netmenu/NMlabel.c	12 Jan 2001 22:13:07 -0000	1.2
+++ netmenu/NMlabel.c	11 Aug 2005 04:56:25 -0000
@@ -24,6 +24,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include <ctype.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
Index: netmenu/NMnetlist.c
===================================================================
RCS file: /ufs/repository/magic/netmenu/NMnetlist.c,v
retrieving revision 1.2
diff -u -r1.2 NMnetlist.c
--- netmenu/NMnetlist.c	12 Jan 2001 22:13:07 -0000	1.2
+++ netmenu/NMnetlist.c	11 Aug 2005 04:56:27 -0000
@@ -22,6 +22,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/utils.h"
 #include "utils/geometry.h"
Index: netmenu/NMundo.c
===================================================================
RCS file: /ufs/repository/magic/netmenu/NMundo.c,v
retrieving revision 1.2
diff -u -r1.2 NMundo.c
--- netmenu/NMundo.c	12 Jan 2001 22:13:07 -0000	1.2
+++ netmenu/NMundo.c	11 Aug 2005 04:56:28 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "windows/windows.h"
Index: netmenu/NMwiring.c
===================================================================
RCS file: /ufs/repository/magic/netmenu/NMwiring.c,v
retrieving revision 1.2
diff -u -r1.2 NMwiring.c
--- netmenu/NMwiring.c	12 Jan 2001 22:13:07 -0000	1.2
+++ netmenu/NMwiring.c	11 Aug 2005 04:56:29 -0000
@@ -24,6 +24,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: plot/plotGremln.c
===================================================================
RCS file: /ufs/repository/magic/plot/plotGremln.c,v
retrieving revision 1.2
diff -u -r1.2 plotGremln.c
--- plot/plotGremln.c	12 Jan 2001 22:13:09 -0000	1.2
+++ plot/plotGremln.c	11 Aug 2005 04:56:31 -0000
@@ -22,6 +22,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: plot/plotInt.h
===================================================================
RCS file: /ufs/repository/magic/plot/plotInt.h,v
retrieving revision 1.8
diff -u -r1.8 plotInt.h
--- plot/plotInt.h	23 Aug 2001 13:48:55 -0000	1.8
+++ plot/plotInt.h	11 Aug 2005 04:56:31 -0000
@@ -27,7 +27,7 @@
 #endif	_GEOMETRY
 
 /* system V machines lack vfont.h, so include the defs below. */
-#if  !defined(SYSV) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(CYGWIN)
+#if  !defined(SYSV) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(CYGWIN) && !defined(__APPLE__)
 #include <vfont.h>
 #else
 struct header {
Index: plot/plotPS.c
===================================================================
RCS file: /ufs/repository/magic/plot/plotPS.c,v
retrieving revision 1.11
diff -u -r1.11 plotPS.c
--- plot/plotPS.c	13 Aug 2001 19:31:25 -0000	1.11
+++ plot/plotPS.c	11 Aug 2005 04:56:34 -0000
@@ -22,6 +22,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: plot/plotPixels.c
===================================================================
RCS file: /ufs/repository/magic/plot/plotPixels.c,v
retrieving revision 1.3
diff -u -r1.3 plotPixels.c
--- plot/plotPixels.c	12 Jan 2001 22:13:10 -0000	1.3
+++ plot/plotPixels.c	11 Aug 2005 04:56:35 -0000
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <math.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/geofast.h"
Index: plot/plotRutils.c
===================================================================
RCS file: /ufs/repository/magic/plot/plotRutils.c,v
retrieving revision 1.3
diff -u -r1.3 plotRutils.c
--- plot/plotRutils.c	12 Jan 2001 22:13:10 -0000	1.3
+++ plot/plotRutils.c	11 Aug 2005 04:56:36 -0000
@@ -26,6 +26,7 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "tiles/tile.h"
Index: resis/ResRex.c
===================================================================
RCS file: /ufs/repository/magic/resis/ResRex.c,v
retrieving revision 1.3
diff -u -r1.3 ResRex.c
--- resis/ResRex.c	23 Aug 2001 13:48:56 -0000	1.3
+++ resis/ResRex.c	11 Aug 2005 04:58:06 -0000
@@ -10,6 +10,12 @@
 /* It is hard to get the value of MAXFLOAT in a portable manner. */
 #if defined(ibm032) || defined(CYGWIN) 
 #define MAXFLOAT        ((float)3.40282346638528860e+38)
+#elif defined(__FreeBSD__) || defined(__APPLE__)
+       #include <float.h>
+       #include <limits.h> 
+       #ifndef MAXFLOAT
+       #define MAXFLOAT        FLT_MAX
+       #endif
 #elif !defined(__NetBSD__)
 #include <values.h>
 #endif
Index: router/ftrFdback.c
===================================================================
RCS file: /ufs/repository/magic/router/ftrFdback.c,v
retrieving revision 1.2
diff -u -r1.2 ftrFdback.c
--- router/ftrFdback.c	12 Jan 2001 22:13:17 -0000	1.2
+++ router/ftrFdback.c	11 Aug 2005 04:58:09 -0000
@@ -24,6 +24,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "misc/styles.h"
Index: router/rtrChannel.c
===================================================================
RCS file: /ufs/repository/magic/router/rtrChannel.c,v
retrieving revision 1.2
diff -u -r1.2 rtrChannel.c
--- router/rtrChannel.c	12 Jan 2001 22:13:18 -0000	1.2
+++ router/rtrChannel.c	11 Aug 2005 04:58:10 -0000
@@ -20,6 +20,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/geofast.h"
Index: router/rtrPin.c
===================================================================
RCS file: /ufs/repository/magic/router/rtrPin.c,v
retrieving revision 1.2
diff -u -r1.2 rtrPin.c
--- router/rtrPin.c	12 Jan 2001 22:13:18 -0000	1.2
+++ router/rtrPin.c	11 Aug 2005 04:58:16 -0000
@@ -22,6 +22,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "misc/styles.h"
Index: scripts/config
===================================================================
RCS file: /ufs/repository/magic/scripts/config,v
retrieving revision 1.23
diff -u -r1.23 config
--- scripts/config	3 Oct 2002 19:15:33 -0000	1.23
+++ scripts/config	11 Aug 2005 04:59:16 -0000
@@ -698,6 +698,8 @@
 SCRIPTS                = \${MAGICDIR}/scripts
 
 MODULES               += $modules
+# optional program suffix (e.g. -7.1)
+PROGRAM_SUFFIX		=
 
 # Define your make environment
 # MAKE                   = gmake
Index: signals/signals.c
===================================================================
RCS file: /ufs/repository/magic/signals/signals.c,v
retrieving revision 1.7
diff -u -r1.7 signals.c
--- signals/signals.c	3 Oct 2001 22:38:09 -0000	1.7
+++ signals/signals.c	11 Aug 2005 04:59:23 -0000
@@ -22,6 +22,8 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include <string.h>
+#include <stdlib.h>
 
 #ifndef	SIGEMT
 #define	SIGEMT	7	/* EMT instruction (SIGUNUSED) */
Index: sim/SimDBstuff.c
===================================================================
RCS file: /ufs/repository/magic/sim/SimDBstuff.c,v
retrieving revision 1.4
diff -u -r1.4 SimDBstuff.c
--- sim/SimDBstuff.c	29 Nov 2001 20:08:52 -0000	1.4
+++ sim/SimDBstuff.c	11 Aug 2005 04:59:25 -0000
@@ -25,6 +25,7 @@
 
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/geofast.h"
Index: sim/SimExtract.c
===================================================================
RCS file: /ufs/repository/magic/sim/SimExtract.c,v
retrieving revision 1.3
diff -u -r1.3 SimExtract.c
--- sim/SimExtract.c	29 Nov 2001 20:08:52 -0000	1.3
+++ sim/SimExtract.c	11 Aug 2005 04:59:26 -0000
@@ -20,6 +20,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
Index: sim/SimRsim.c
===================================================================
RCS file: /ufs/repository/magic/sim/SimRsim.c,v
retrieving revision 1.4
diff -u -r1.4 SimRsim.c
--- sim/SimRsim.c	23 Aug 2001 13:48:57 -0000	1.4
+++ sim/SimRsim.c	11 Aug 2005 04:59:26 -0000
@@ -27,6 +27,8 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/file.h>
+#include <string.h>
+#include <unistd.h>
 #include "misc/magic.h"
 #include "utils/stack.h"
 #include "utils/geometry.h"
Index: tech/tech.c
===================================================================
RCS file: /ufs/repository/magic/tech/tech.c,v
retrieving revision 1.3
diff -u -r1.3 tech.c
--- tech/tech.c	12 Jan 2001 22:13:25 -0000	1.3
+++ tech/tech.c	11 Aug 2005 04:59:27 -0000
@@ -31,7 +31,7 @@
 #include "utils/malloc.h"
 
 #ifndef NO_VARARGS
-#include <varargs.h>
+#include <stdarg.h>
 #endif  NO_VARARGS
 
 global char *TechDefault = NULL;
@@ -415,15 +415,11 @@
  /*VARARGS0*/
 
 void
-TechError(va_alist)
-va_dcl
+TechError(char* fmt, ...)
 {
     va_list args;
-    char *fmt;
-
     TechPrintLine();
-    va_start(args);
-    fmt = va_arg(args, char *);
+    va_start(args, fmt);
     (void) GrVfprintf(stderr, fmt, args);
     va_end(args);
 }
Index: tech/tech.h
===================================================================
RCS file: /ufs/repository/magic/tech/tech.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tech.h
--- tech/tech.h	29 Mar 2000 18:35:37 -0000	1.1.1.1
+++ tech/tech.h	11 Aug 2005 04:59:27 -0000
@@ -23,4 +23,8 @@
 /* ----------------- Exported variables and procedures ---------------- */
 
 extern char *TechDefault;	/* Name of default technology */
+#ifndef NO_VARARGS
+extern void TechError(char* fmt, ...);
+#else
 extern void TechError();
+#endif
Index: textio/textio.h
===================================================================
RCS file: /ufs/repository/magic/textio/textio.h,v
retrieving revision 1.2
diff -u -r1.2 textio.h
--- textio/textio.h	12 Jan 2001 22:13:26 -0000	1.2
+++ textio/textio.h	11 Aug 2005 04:59:27 -0000
@@ -29,10 +29,18 @@
 #endif
 
 /* printing procedures */
+#ifndef NO_VARARGS
+extern void TxPrintf(char*, ...);
+#else
 extern void TxPrintf();
+#endif
 extern bool TxPrintOn();  	/* enables TxPrintf output */
 extern bool TxPrintOff();	/* disables TxPrintf output */
+#ifndef NO_VARARGS
+extern void TxError(char*, ...);
+#else
 extern void TxError();
+#endif
 extern void TxFlush();
 extern void TxVisChar();
 extern void TxUseMore();
Index: textio/textioInt.h
===================================================================
RCS file: /ufs/repository/magic/textio/textioInt.h,v
retrieving revision 1.3
diff -u -r1.3 textioInt.h
--- textio/textioInt.h	23 Aug 2001 13:48:57 -0000	1.3
+++ textio/textioInt.h	11 Aug 2005 04:59:27 -0000
@@ -56,4 +56,8 @@
 #endif SYSV
 
 extern int TxGetInputEvent();
+#ifndef NO_VARARGS
+extern void txFprintfBasic(FILE*, char*, ...);
+#else
 extern void txFprintfBasic();
+#endif
Index: textio/txCommands.c
===================================================================
RCS file: /ufs/repository/magic/textio/txCommands.c,v
retrieving revision 1.7
diff -u -r1.7 txCommands.c
--- textio/txCommands.c	23 Jul 2001 20:37:01 -0000	1.7
+++ textio/txCommands.c	11 Aug 2005 04:59:28 -0000
@@ -22,6 +22,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include <ctype.h>
 #include <errno.h>
 #include <sys/types.h>
Index: textio/txInput.c
===================================================================
RCS file: /ufs/repository/magic/textio/txInput.c,v
retrieving revision 1.12
diff -u -r1.12 txInput.c
--- textio/txInput.c	5 Mar 2002 21:00:03 -0000	1.12
+++ textio/txInput.c	11 Aug 2005 04:59:30 -0000
@@ -57,7 +57,7 @@
 #include "readline/history.h"
 #endif
 
-#ifdef READLINE_4_DOT_2_PLUS
+#if defined(READLINE_4_DOT_2_PLUS) || (RL_VERSION_MAJOR >= 5) || (RL_VERSION_MAJOR == 4 && RL_VERSION_MINOR >= 2)
 #define filename_completion_function rl_filename_completion_function
 #define username_completion_function rl_username_completion_function
 #endif
Index: textio/txMore.c
===================================================================
RCS file: /ufs/repository/magic/textio/txMore.c,v
retrieving revision 1.2
diff -u -r1.2 txMore.c
--- textio/txMore.c	12 Jan 2001 22:13:26 -0000	1.2
+++ textio/txMore.c	11 Aug 2005 04:59:30 -0000
@@ -19,6 +19,7 @@
 static char rcsid[]  =  "$Header: /ufs/repository/magic/textio/txMore.c,v 1.2 2001/01/12 22:13:26 jsolomon Exp $";
 #endif  not lint
 
+#include <stdio.h>
 #include "misc/magic.h"
 
 
Index: textio/txOutput.c
===================================================================
RCS file: /ufs/repository/magic/textio/txOutput.c,v
retrieving revision 1.4
diff -u -r1.4 txOutput.c
--- textio/txOutput.c	21 Feb 2001 15:52:52 -0000	1.4
+++ textio/txOutput.c	11 Aug 2005 04:59:30 -0000
@@ -42,7 +42,7 @@
 #include "utils/malloc.h"
 
 #ifndef	NO_VARARGS
-#include <varargs.h>
+#include <stdarg.h>
 #endif	NO_VARARGS
 
 /* When a pipe has been opened to "more", the following variables
@@ -82,16 +82,10 @@
  /*VARARGS0*/
 
 void
-txFprintfBasic(va_alist)
-va_dcl
+txFprintfBasic(FILE* f, char* fmt, ...)
 {
     va_list args;
-    char *fmt;
-    FILE *f;
-
-    va_start(args);
-    f = va_arg(args, FILE *);
-    fmt = va_arg(args, char *);
+    va_start(args, fmt);
     (void) GrVfprintf(f, fmt, args);
     va_end(args);
 }
@@ -135,11 +129,9 @@
  /*VARARGS0*/
 
 void
-TxPrintf(va_alist)
-va_dcl
+TxPrintf(char* fmt, ...)
 {
     va_list args;
-    char *fmt;
     FILE *f;
 
     if (txPrintFlag)
@@ -156,16 +148,14 @@
 	if (txHavePrompt)
 	{
 	    TxUnPrompt();
-	    va_start(args);
-	    fmt = va_arg(args, char *);
+	    va_start(args, fmt);
 	    (void) GrVfprintf(f, fmt, args);
 	    va_end(args);
 	    TxPrompt();
 	}
 	else 
 	{
-	    va_start(args);
-	    fmt = va_arg(args, char *);
+	    va_start(args, fmt);
 	    (void) GrVfprintf(f, fmt, args);
 	    va_end(args);
 	}
@@ -306,11 +296,9 @@
 #ifndef	NO_VARARGS
 
 void
-TxError(va_alist)
-va_dcl
+TxError(char* fmt, ...)
 {
     va_list args;
-    char *fmt;
     FILE *f;
 
     (void) fflush(stdout);
@@ -321,15 +309,13 @@
     if (txHavePrompt)
     {
 	TxUnPrompt();
-	va_start(args);
-	fmt = va_arg(args, char *);
+	va_start(args, fmt);
 	(void) GrVfprintf(f, fmt, args);
 	va_end(args);
 	TxPrompt();
     }
     else {
-	va_start(args);
-	fmt = va_arg(args, char *);
+	va_start(args, fmt);
 	(void) GrVfprintf(f, fmt, args);
 	va_end(args);
     }
Index: utils/LIBmain.c
===================================================================
RCS file: /ufs/repository/magic/utils/LIBmain.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 LIBmain.c
--- utils/LIBmain.c	29 Mar 2000 18:35:16 -0000	1.1.1.1
+++ utils/LIBmain.c	11 Aug 2005 04:59:33 -0000
@@ -22,6 +22,7 @@
 #endif	not lint
 
 #include <stdio.h>
+#include <stdlib.h>
 
 
 /*
Index: utils/LIBtextio.c
===================================================================
RCS file: /ufs/repository/magic/utils/LIBtextio.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 LIBtextio.c
--- utils/LIBtextio.c	29 Mar 2000 18:35:16 -0000	1.1.1.1
+++ utils/LIBtextio.c	11 Aug 2005 04:59:33 -0000
@@ -22,7 +22,7 @@
 #endif	not lint
 
 #include <stdio.h>
-#include <varargs.h>
+#include <stdarg.h>
 
 /*
  * ----------------------------------------------------------------------------
@@ -65,15 +65,14 @@
  */
 
     /*VARARGS*/
-TxError(fmt, va_alist)
-    char *fmt;
-    va_dcl
+void
+TxError(char* fmt, ...)
 {
     va_list ap;
  
     (void) fflush(stdout);
     (void) fflush(stderr);
-    va_start(ap);
+    va_start(ap, fmt);
     vfprintf(stderr, fmt, ap);
     va_end(ap);
     (void) fflush(stderr);
@@ -96,15 +95,14 @@
  */
 
     /*VARARGS*/
-TxPrintf(fmt, va_alist)
-    char *fmt;
-    va_dcl
+void
+TxPrintf(char* fmt, ...)
 {
     va_list ap;
  
     (void) fflush(stderr);
     (void) fflush(stdout);
-    va_start(ap);
+    va_start(ap, fmt);
     vfprintf(stdout, fmt, ap);
     va_end(ap);
     (void) fflush(stdout);
Index: utils/doubleint.c
===================================================================
RCS file: /ufs/repository/magic/utils/doubleint.c,v
retrieving revision 1.3
diff -u -r1.3 doubleint.c
--- utils/doubleint.c	9 Mar 2001 23:29:50 -0000	1.3
+++ utils/doubleint.c	11 Aug 2005 04:59:34 -0000
@@ -22,6 +22,7 @@
 #ifdef SYSV
 #include <string.h>
 #endif
+#include <strings.h>
 #include "misc/magic.h"
 #include "textio/textio.h"
 #include "utils/doubleint.h"
Index: utils/getrect.c
===================================================================
RCS file: /ufs/repository/magic/utils/getrect.c,v
retrieving revision 1.4
diff -u -r1.4 getrect.c
--- utils/getrect.c	23 Aug 2001 13:48:58 -0000	1.4
+++ utils/getrect.c	11 Aug 2005 04:59:39 -0000
@@ -62,7 +62,7 @@
 #define	FILE_PTR(fin)	((char *) fin->_IO_read_ptr)
 #define FILE_DEC_CNT(fin, n)	
 #define	FILE_SET_PTR(fin, cp) ((fin)->_IO_read_ptr = (cp))
-#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(CYGWIN)
+#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(CYGWIN) || defined(__APPLE__)
 #define FILE_CNT(fin)   ((fin)->_r)
 #define FILE_PTR(fin)   ((char *)(fin)->_p)
 #define FILE_DEC_CNT(fin, n)  ((fin)->_r -= (n))
Index: utils/hash.c
===================================================================
RCS file: /ufs/repository/magic/utils/hash.c,v
retrieving revision 1.2
diff -u -r1.2 hash.c
--- utils/hash.c	12 Jan 2001 22:13:31 -0000	1.2
+++ utils/hash.c	11 Aug 2005 04:59:41 -0000
@@ -23,6 +23,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/hash.h"
 #include "utils/malloc.h"
Index: utils/heap.c
===================================================================
RCS file: /ufs/repository/magic/utils/heap.c,v
retrieving revision 1.2
diff -u -r1.2 heap.c
--- utils/heap.c	12 Jan 2001 22:13:31 -0000	1.2
+++ utils/heap.c	11 Aug 2005 04:59:42 -0000
@@ -21,6 +21,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <strings.h>
 #include "misc/magic.h"
 #include "utils/doubleint.h"
 #include "utils/heap.h"
Index: utils/malloc.c
===================================================================
RCS file: /ufs/repository/magic/utils/malloc.c,v
retrieving revision 1.6
diff -u -r1.6 malloc.c
--- utils/malloc.c	23 Aug 2001 13:48:58 -0000	1.6
+++ utils/malloc.c	11 Aug 2005 04:59:45 -0000
@@ -29,6 +29,10 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <signal.h>
+#include <strings.h>
+#if defined(__APPLE__)
+#include <mach-o/getsect.h>
+#endif
 #include "misc/magic.h"
 #include "utils/malloc.h"
 
@@ -643,6 +647,8 @@
     int cursize;
 #if defined(linux) || defined(CYGWIN)
     extern int etext asm("etext");
+#elif defined(__APPLE__)
+    // use get_etext(), as defined in <mach-o/getsect.h>
 #else
     extern etext;
 #endif
@@ -682,6 +688,8 @@
     }
 #ifdef ibm032
     cursize = lastaddr - (char *) 0x10000000 ;
+#elif defined(__APPLE__)
+    cursize = (unsigned long) lastaddr - get_etext();
 #else
     cursize = lastaddr - (char *) &etext;
 #endif
Index: utils/path.c
===================================================================
RCS file: /ufs/repository/magic/utils/path.c,v
retrieving revision 1.5
diff -u -r1.5 path.c
--- utils/path.c	12 Jan 2001 22:13:32 -0000	1.5
+++ utils/path.c	11 Aug 2005 04:59:47 -0000
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <pwd.h>
 #include <ctype.h>
+#include <string.h>
 #include <sys/param.h>
 #include "misc/magic.h"
 #include "utils/hash.h"
Index: utils/printstuff.c
===================================================================
RCS file: /ufs/repository/magic/utils/printstuff.c,v
retrieving revision 1.2
diff -u -r1.2 printstuff.c
--- utils/printstuff.c	12 Jan 2001 22:13:32 -0000	1.2
+++ utils/printstuff.c	11 Aug 2005 04:59:48 -0000
@@ -2,6 +2,7 @@
 static char rcsid[] = "$Header: /ufs/repository/magic/utils/printstuff.c,v 1.2 2001/01/12 22:13:32 jsolomon Exp $";
 #endif not lint
 
+#include <stdio.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 
Index: utils/runstats.c
===================================================================
RCS file: /ufs/repository/magic/utils/runstats.c,v
retrieving revision 1.2
diff -u -r1.2 runstats.c
--- utils/runstats.c	12 Jan 2001 22:13:33 -0000	1.2
+++ utils/runstats.c	11 Aug 2005 04:59:48 -0000
@@ -32,7 +32,11 @@
 /* Library imports: */
 
 extern char *sbrk();
+#if defined(__APPLE__)
+#include <mach-o/getsect.h>
+#else
 extern end;
+#endif
 
 /*
  * ----------------------------------------------------------------------------
@@ -125,7 +129,11 @@
 
     if (flags & RS_MEM)
     {
+#if defined(__APPLE__)
+	size = (((int) sbrk(0) - get_end()) + 512)/1024;
+#else
 	size = (((int) sbrk(0) - (int) &end) + 512)/1024;
+#endif
 	if (sp != string)
 	    *sp++ = ' ';
 	sprintf(sp, "%dk", size);
Index: utils/saveimage.c
===================================================================
RCS file: /ufs/repository/magic/utils/saveimage.c,v
retrieving revision 1.2
diff -u -r1.2 saveimage.c
--- utils/saveimage.c	12 Jan 2001 22:13:33 -0000	1.2
+++ utils/saveimage.c	11 Aug 2005 04:59:49 -0000
@@ -23,7 +23,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-
+#include <strings.h>
 #include "misc/magic.h"
 
 /* This code only works on a VAX or a SUN */
Index: utils/strdup.c
===================================================================
RCS file: /ufs/repository/magic/utils/strdup.c,v
retrieving revision 1.2
diff -u -r1.2 strdup.c
--- utils/strdup.c	12 Jan 2001 22:13:33 -0000	1.2
+++ utils/strdup.c	11 Aug 2005 04:59:50 -0000
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/malloc.h"
 
Index: windows/windMain.c
===================================================================
RCS file: /ufs/repository/magic/windows/windMain.c,v
retrieving revision 1.2
diff -u -r1.2 windMain.c
--- windows/windMain.c	12 Jan 2001 22:13:35 -0000	1.2
+++ windows/windMain.c	11 Aug 2005 04:59:57 -0000
@@ -48,6 +48,7 @@
 #endif  not lint
 
 #include <stdio.h>
+#include <string.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "graphics/glyphs.h"