diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2015-07-17 13:52:27 +0100 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2015-07-17 13:52:27 +0100 |
| commit | 0f51a82296a4849680b505d1d0d0ebce6c35d9e7 (patch) | |
| tree | 31f65f26474bda3c0de285c43f18a07284a1e325 | |
| parent | 214a0f11e3f917dba65f97e4e2b926b8b857df9b (diff) | |
mingw: Stop bundling our sal.h header.
| -rw-r--r-- | thirdparty/directxtex/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | thirdparty/mingw/sal/sal.h | 27 |
2 files changed, 0 insertions, 33 deletions
diff --git a/thirdparty/directxtex/CMakeLists.txt b/thirdparty/directxtex/CMakeLists.txt index 052bc89f..e971a963 100644 --- a/thirdparty/directxtex/CMakeLists.txt +++ b/thirdparty/directxtex/CMakeLists.txt @@ -15,12 +15,6 @@ if (DirectX_D3D11_INCLUDE_FOUND) endif () if (MINGW) - # Older versions of MinGW do not include the sal.h header. Use our own. - check_include_file_cxx (sal.h HAVE_SAL_H) - if (NOT HAVE_SAL_H) - include_directories (BEFORE ${CMAKE_SOURCE_DIR}/thirdparty/mingw/sal) - endif () - # MinGW wincodec.h is incomplete. Use our own. include_directories (BEFORE ${CMAKE_SOURCE_DIR}/thirdparty/mingw/wincodec) diff --git a/thirdparty/mingw/sal/sal.h b/thirdparty/mingw/sal/sal.h deleted file mode 100644 index 99871197..00000000 --- a/thirdparty/mingw/sal/sal.h +++ /dev/null @@ -1,27 +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 SAL_HXX -#define SAL_HXX - -#ifdef __GNUC__ -# define __inner_checkReturn __attribute__((warn_unused_result)) -#elif defined(_MSC_VER) -# define __inner_checkReturn __declspec("SAL_checkReturn") -#else -# define __inner_checkReturn -#endif - -#define __checkReturn __inner_checkReturn - -#define _In_ -#define _In_opt_ -#define _Out_ - -#define _Struct_size_bytes_(size) - -#endif - |