This header file is not installed and the only useful part of it is
inclusion of windows.h.
Files crtdll.c and crtexe.c already include windows.h.
---
mingw-w64-crt/Makefile.am | 4 +--
mingw-w64-crt/crt/crtdll.c | 1 -
mingw-w64-crt/crt/crtexe.c | 1 -
mingw-w64-crt/include/oscalls.h | 60 ---------------------------------
mingw-w64-crt/misc/dllmain.c | 2 +-
5 files changed, 3 insertions(+), 65 deletions(-)
delete mode 100644 mingw-w64-crt/include/oscalls.h
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index a56c8790d64a..53157ecec182 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -115,7 +115,7 @@ src_libtaskschd=libsrc/taskschd.c
src_libntoskrnl=libsrc/memcmp.c
src_libdloadhelper=libsrc/dloadhelper.c misc/delay-f.c
-src_libmingw32=include/oscalls.h include/internal.h include/sect_attribs.h \
+src_libmingw32=include/internal.h include/sect_attribs.h \
crt/crtexewin.c crt/dll_argv.c crt/gccmain.c crt/natstart.c
crt/pseudo-reloc-list.c crt/wildcard.c \
crt/charmax.c crt/ucrtexewin.c crt/dllargv.c crt/_newmode.c
crt/tlssup.c crt/xncommod.c \
crt/cinitexe.c crt/merr.c crt/pesect.c crt/udllargc.c
crt/xthdloc.c \
@@ -4484,7 +4484,7 @@ dist_libsrc_DATA = \
#
noinst_HEADERS = libsrc/dxerr.c \
- include/internal.h include/oscalls.h include/sect_attribs.h
+ include/internal.h include/sect_attribs.h
# Cleaning options
diff --git a/mingw-w64-crt/crt/crtdll.c b/mingw-w64-crt/crt/crtdll.c
index a605c9532339..18e831ef9525 100644
--- a/mingw-w64-crt/crt/crtdll.c
+++ b/mingw-w64-crt/crt/crtdll.c
@@ -4,7 +4,6 @@
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#include <oscalls.h>
#include <internal.h>
#include <stdlib.h>
#include <windows.h>
diff --git a/mingw-w64-crt/crt/crtexe.c b/mingw-w64-crt/crt/crtexe.c
index 35e1933848b0..6e19ce75b7c5 100644
--- a/mingw-w64-crt/crt/crtexe.c
+++ b/mingw-w64-crt/crt/crtexe.c
@@ -4,7 +4,6 @@
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#include <oscalls.h>
#include <internal.h>
#include <process.h>
#include <signal.h>
diff --git a/mingw-w64-crt/include/oscalls.h b/mingw-w64-crt/include/oscalls.h
deleted file mode 100644
index 670a6f748534..000000000000
--- a/mingw-w64-crt/include/oscalls.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#ifndef _INC_OSCALLS
-#define _INC_OSCALLS
-
-#ifndef _CRTBLD
-#error ERROR: Use of C runtime library internal header file.
-#endif
-
-#include <crtdefs.h>
-
-#ifdef NULL
-#undef NULL
-#endif
-
-#define NOMINMAX
-
-#define _WIN32_FUSION 0x0100
-#include <windows.h>
-
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4214)
-#endif
-
-typedef struct _FTIME
-{
- unsigned short twosecs : 5;
- unsigned short minutes : 6;
- unsigned short hours : 5;
-} FTIME;
-
-typedef FTIME *PFTIME;
-
-typedef struct _FDATE
-{
- unsigned short day : 5;
- unsigned short month : 4;
- unsigned short year : 7;
-} FDATE;
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-typedef FDATE *PFDATE;
-
-#endif
diff --git a/mingw-w64-crt/misc/dllmain.c b/mingw-w64-crt/misc/dllmain.c
index 7f97b0a89ed5..3f5b5261bffa 100644
--- a/mingw-w64-crt/misc/dllmain.c
+++ b/mingw-w64-crt/misc/dllmain.c
@@ -1,4 +1,4 @@
-#include <oscalls.h>
+#include <windows.h>
#define _DECL_DLLMAIN
#include <process.h>
--
2.20.1
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
