Use correct paths for partially included header files.

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index e8ff75b..83fe8f2 100644 (file)
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,15 @@
+2016-04-26  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Use correct paths for partially included header files.
+
+       * include/io.h include/process.h: Use 'iquote' #include "stdint.h", to
+       ensure that we get stdint.h from the same include directory.
+       * include/stdio.h: Likewise for #include "stdarg.h", and "sys/types.h"
+       * include/wchar.h: Likewise for all of #include "stdio.h", "stdlib.h",
+       "direct.h", "sys/stat.h", "io.h", "time.h", "locale.h", and "process.h"
+       * include/dir.h include/dos.h: Likewise for #include "io.h"
+       * include/direct.h: Likewise for #include "dos.h"
+
 2016-04-13  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Generalize procedure for installing manpages.

diff --git a/mingwrt/include/dir.h b/mingwrt/include/dir.h
index 6897d82..a5714a1 100644 (file)
--- a/mingwrt/include/dir.h
+++ b/mingwrt/include/dir.h
@@ -35,6 +35,6 @@
 #define _DIR_H
 
 #warning "<dir.h> is obsolete; please use <io.h> instead."
-#include <io.h>
+#include "io.h"
 
 #endif /* !_DIR_H: $RCSfile$: end of file */

diff --git a/mingwrt/include/direct.h b/mingwrt/include/direct.h
index b533da2..5ce43a6 100644 (file)
--- a/mingwrt/include/direct.h
+++ b/mingwrt/include/direct.h
@@ -50,7 +50,7 @@
  * from <dos.h>; thus, we may simply include <dos.h> here, and let
  * it take care of including both <mingw.h> and <io.h> for us.
  */
-#include <dos.h>
+#include "dos.h"
 
 #undef __DIRECT_H_SOURCED__
 #endif /* !__WCHAR_H_SOURCED__ */

diff --git a/mingwrt/include/dos.h b/mingwrt/include/dos.h
index 468af73..6d1435f 100644 (file)
--- a/mingwrt/include/dos.h
+++ b/mingwrt/include/dos.h
@@ -53,7 +53,7 @@
  * it, while also allowing <direct.h> to delegate responsibility for the
  * inclusion of both <_mingw.h> and <io.h> to us.
  */
-#include <io.h>
+#include "io.h"
 
 #ifndef RC_INVOKED
 

diff --git a/mingwrt/include/io.h b/mingwrt/include/io.h
index 7ab6499..70c1044 100644 (file)
--- a/mingwrt/include/io.h
+++ b/mingwrt/include/io.h
@@ -58,10 +58,13 @@
 #endif /* !__WCHAR_H_SOURCED__ */
 
 /* This will give us intptr_t, which we need in ALL cases, whether
- * including <io.h> directly, or selectively via <wchar.h>.
+ * including <io.h> directly, or selectively via <wchar.h>; (note: we
+ * use the #include "..." form here, to ensure that we read the type
+ * definition directly from the stdint.h header located in the same
+ * directory as this <io.h> file).
  */
 #define __need_intptr_t
-#include <stdint.h>
+#include "stdint.h"
 
 /* Attributes of files as returned by _findfirst() et al.  MSDN is not
  * explicit about whether or not these should be defined when including

diff --git a/mingwrt/include/process.h b/mingwrt/include/process.h
index cda2e41..aadbc89 100644 (file)
--- a/mingwrt/include/process.h
+++ b/mingwrt/include/process.h
@@ -83,10 +83,12 @@
 
 /* All Microsoft implementations of the exec() and spawn() functions
  * are declared with intptr_t as their return type; get its definition
- * by selective inclusion from <stdint.h>.
+ * by selective inclusion from "stdint.h"; (note: use #include "..."
+ * here, to avoid side effects from any alternative <stdint.h>, which
+ * is not in the same directory as this <process.h>).
  */
 #define __need_intptr_t
-#include <stdint.h>
+#include "stdint.h"
 
 _BEGIN_C_DECLS
 
@@ -288,4 +290,4 @@ _CRTIMP __cdecl __MINGW_NOTHROW intptr_t _wspawnvpe
 _END_C_DECLS
 
 #endif /* ! RC_INVOKED */
-#endif /* !_PROCESS_H: $RCSfile$: endof file */
+#endif /* !_PROCESS_H: $RCSfile$: end of file */

diff --git a/mingwrt/include/stdio.h b/mingwrt/include/stdio.h
index eca9448..ff4723e 100644 (file)
--- a/mingwrt/include/stdio.h
+++ b/mingwrt/include/stdio.h
@@ -86,17 +86,20 @@
  * preceding groups...
  */
 #if defined __need_off_t || defined __need___off64_t
- /* ...to identify a requirement for selective inclusion from...
+ /* ...to identify a requirement for selective inclusion of one or more
+  * of these type definitions from "sys/types.h"; (note that we use the
+  * #include "..." form here, to ensure that we get the correct header
+  * file, relative to the location of this <stdio.h>).
   */
-# include <sys/types.h>
+# include "sys/types.h"
 #endif
 
 #ifndef __VALIST
- /* Also similarly, for the va_list type, defined in <stdarg.h>
+ /* Also similarly, for the va_list type, defined in "stdarg.h"
   */
 # if defined __GNUC__ && __GNUC__ >= 3
 #  define __need___va_list
-#  include <stdarg.h>
+#  include "stdarg.h"
 #  define __VALIST __builtin_va_list
 # else
 #  define __VALIST char *

diff --git a/mingwrt/include/wchar.h b/mingwrt/include/wchar.h
index da61e4e..a187c7e 100644 (file)
--- a/mingwrt/include/wchar.h
+++ b/mingwrt/include/wchar.h
@@ -80,7 +80,7 @@
  * retrieve the overlapping content, without requiring duplication of
  * that content here; thus, from...
  */
-#include <stdio.h>
+#include "stdio.h"
 /* ...we obtain (possibly indirect) definitions and declarations for:
  *
  *  macros  NULL, FILENAME_MAX
@@ -144,7 +144,7 @@
  *
  * In similar fashion, from...
  */
-#include <stdlib.h>
+#include "stdlib.h"
 /* ...we obtain prototypes for universally supported functions:
  *
  *  long wcstol (const wchar_t *, wchar_t **, int);
@@ -178,7 +178,7 @@
  *
  * while from...
  */
-#include <direct.h>
+#include "direct.h"
 /* ...we obtain prototypes for each of the following functions,
  * (none of which are available when using CRTDLL.DLL):
  *
@@ -191,7 +191,7 @@
  *
  * From...
  */
-#include <sys/stat.h>
+#include "sys/stat.h"
 /* ...we obtain function prototypes, and all associated data type
  * definitions for this pair of actual functions, in all versions of
  * MSVCRT.DLL, and its non-free derivatives preceding MSVCR80.DLL, (or
@@ -216,7 +216,7 @@
  *
  * while from...
  */
-#include <io.h>
+#include "io.h"
 /* ...we obtain function prototypes for each of the following, which
  * are available in all versions of MSVCRT.DLL, (and all its non-free
  * derivatives), but are not supported by CRTDLL.DLL:
@@ -268,7 +268,7 @@
  *
  * and from...
  */
-#include <time.h>
+#include "time.h"
 /* ...we obtain an opaque forward declaration of:
  *
  *  struct tm
@@ -304,7 +304,7 @@
  *
  * Also, from...
  */
-#include <locale.h>
+#include "locale.h"
 /* ...we obtain the declaration for:
  *
  *   wchar_t *_wsetlocale (int, const wchar_t *);
@@ -312,7 +312,7 @@
  *
  * and from...
  */
-#include <process.h>
+#include "process.h"
 /* ...we obtain function prototypes for:
  *
  *  intptr_t _wexecl (const wchar_t *, const wchar_t *, ...);