Moving to 2.13.2.

1 files changed, 59 insertions, 26 deletions

diff --git a/missing.c b/missing.c
index 2f387fb5..daf16e60 100644
--- a/missing.c
+++ b/missing.c
@@ -1,60 +1,93 @@
-#ifdef MSDOS
-#define BCOPY_MISSING
-#define STRCASE_MISSING
-#define BLKSIZE_MISSING
-#define SPRINTF_INT
-#define RANDOM_MISSING
-#define GETOPT_MISSING
+/*
+ * Do all necessary includes here, so that we don't have to worry about
+ * overlapping includes in the files in missing.d.
+ */
+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#ifndef VAXC
+#include <fcntl.h>
+#include <sys/types.h>
+#else	/*VAXC (VMS)*/
+#include <file.h>
+#include <types.h>
 #endif
+#include <varargs.h>
 
-#ifdef DUP2_MISSING
-#include "missing.d/dup2.c"
-#endif /* DUP2_MISSING */
+#include "config.h"
 
-#ifdef GCVT_MISSING
-#include "missing.d/gcvt.c"
-#endif /* GCVT_MISSING */
+#ifdef TZSET_MISSING
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+
+#ifdef atarist
+/*
+ * this will work with gcc compiler - for other compilers you may
+ * have to replace path separators in this file into backslashes
+ */
+#include "atari/stack.c"
+#include "atari/tmpnam.c"
+#include "atari/textrd.c"	/* gnulib bug fix */
+#endif /* atarist */
+
+#ifdef SYSTEM_MISSING
+#ifdef atarist
+#include "atari/system.c"
+#else
+#include "missing/system.c"
+#endif
+#endif /* SYSTEM_MISSING */
 
 #ifdef GETOPT_MISSING
-#include "missing.d/getopt.c"
+#include "missing/getopt.c"
 #endif	/* GETOPT_MISSING */
 
 #ifdef MEMCMP_MISSING
-#include "missing.d/memcmp.c"
+#include "missing/memcmp.c"
 #endif	/* MEMCMP_MISSING */
 
 #ifdef MEMCPY_MISSING
-#include "missing.d/memcpy.c"
+#include "missing/memcpy.c"
 #endif	/* MEMCPY_MISSING */
 
 #ifdef MEMSET_MISSING
-#include "missing.d/memset.c"
+#include "missing/memset.c"
 #endif	/* MEMSET_MISSING */
 
 #ifdef RANDOM_MISSING
-#include "missing.d/random.c"
+#include "missing/random.c"
 #endif	/* RANDOM_MISSING */
 
 #ifdef STRCASE_MISSING
-#include "missing.d/strcase.c"
+#include "missing/strcase.c"
 #endif	/* STRCASE_MISSING */
 
 #ifdef STRCHR_MISSING
-#include "missing.d/strchr.c"
+#include "missing/strchr.c"
 #endif	/* STRCHR_MISSING */
 
 #ifdef STRERROR_MISSING
-#include "missing.d/strerror.c"
+#include "missing/strerror.c"
 #endif	/* STRERROR_MISSING */
 
+#ifdef STRFTIME_MISSING
+#include "missing/strftime.c"
+#endif	/* STRFTIME_MISSING */
+
 #ifdef STRTOD_MISSING
-#include "missing.d/strtod.c"
+#include "missing/strtod.c"
 #endif	/* STRTOD_MISSING */
 
-#ifdef TMPNAM_MISSING
-#include "missing.d/tmpnam.c"
-#endif	/* TMPNAM_MISSING */
+#ifdef STRTOL_MISSING
+#include "missing/strtol.c"
+#endif	/* STRTOL_MISSING */
 
 #if defined(VPRINTF_MISSING) && defined(BSDSTDIO)
-#include "missing.d/vprintf.c"
+#include "missing/vprintf.c"
 #endif	/* VPRINTF_MISSING && BSDSTDIO */
+
+#ifdef TZSET_MISSING
+#include "missing/tzset.c"
+#endif /* TZSET_MISSING */