about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-01-21 14:47:03 -0800
committerAlex Crichton <alex@alexcrichton.com>2016-01-21 14:47:03 -0800
commitde4a74956713afea951e95caf732e20a9299b663 (patch)
treeef618d36da554ffdf7423e4ac7a635d2b03e841b
parent5a459ea9189d6b019764a668d369d18a6672fc8b (diff)
downloadrust-de4a74956713afea951e95caf732e20a9299b663.tar.gz
rust-de4a74956713afea951e95caf732e20a9299b663.zip
etc: Remove the mingw-fix-include directory
This isn't used anywhere
-rw-r--r--src/etc/mingw-fix-include/README.txt6
-rw-r--r--src/etc/mingw-fix-include/bits/c++config.h18
-rw-r--r--src/etc/mingw-fix-include/winbase.h18
-rw-r--r--src/etc/mingw-fix-include/winsock2.h27
4 files changed, 0 insertions, 69 deletions
diff --git a/src/etc/mingw-fix-include/README.txt b/src/etc/mingw-fix-include/README.txt
deleted file mode 100644
index e36e6abde91..00000000000
--- a/src/etc/mingw-fix-include/README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The purpose of these headers is to fix issues with mingw v4.0, as described in #9246.
-
-This works by adding this directory to GCC include search path before mingw system headers directories,
-so we can intercept their inclusions and add missing definitions without having to modify files in mingw/include.
-
-Once mingw fixes all 3 issues mentioned in #9246, this directory and all references to it from rust/mk/* may be removed.
diff --git a/src/etc/mingw-fix-include/bits/c++config.h b/src/etc/mingw-fix-include/bits/c++config.h
deleted file mode 100644
index 57533ef5224..00000000000
--- a/src/etc/mingw-fix-include/bits/c++config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#ifndef _FIX_CXXCONFIG_H
-#define _FIX_CXXCONFIG_H 1
-
-#define _GLIBCXX_HAVE_FENV_H 1
-
-#include_next <bits/c++config.h>
-
-#endif
diff --git a/src/etc/mingw-fix-include/winbase.h b/src/etc/mingw-fix-include/winbase.h
deleted file mode 100644
index b1674f5f567..00000000000
--- a/src/etc/mingw-fix-include/winbase.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#ifndef _FIX_WINBASE_H
-#define _FIX_WINBASE_H 1
-
-#define NTDDK_VERSION NTDDI_VERSION
-
-#include_next <winbase.h>
-
-#endif
diff --git a/src/etc/mingw-fix-include/winsock2.h b/src/etc/mingw-fix-include/winsock2.h
deleted file mode 100644
index 5096c2f6702..00000000000
--- a/src/etc/mingw-fix-include/winsock2.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#ifndef _FIX_WINSOCK2_H
-#define _FIX_WINSOCK2_H 1
-
-#include_next <winsock2.h>
-
-// mingw 4.0.x has broken headers (#9246) but mingw-w64 does not.
-#if defined(__MINGW_MAJOR_VERSION) && __MINGW_MAJOR_VERSION == 4
-
-typedef struct pollfd {
-  SOCKET fd;
-  short  events;
-  short  revents;
-} WSAPOLLFD, *PWSAPOLLFD, *LPWSAPOLLFD;
-
-#endif
-
-#endif // _FIX_WINSOCK2_H