diff options
| author | Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au> | 2013-01-22 23:55:29 +1100 |
|---|---|---|
| committer | ben <ben@snaploader.vm> | 2013-01-23 00:44:12 +1100 |
| commit | 4d850a272aabe91eab08bcc735b4297d51e6e35f (patch) | |
| tree | b5a5e48ffa4e7f0f8d3db8b322c7a9fb9b593282 /heimdall/source | |
| parent | 31b1b0b2b0c9312e597ad35e26729474c21b20b9 (diff) | |
| download | external_heimdall-4d850a272aabe91eab08bcc735b4297d51e6e35f.zip external_heimdall-4d850a272aabe91eab08bcc735b4297d51e6e35f.tar.gz external_heimdall-4d850a272aabe91eab08bcc735b4297d51e6e35f.tar.bz2 | |
- Updated MSVC projects to MSVC2012.
- Changed from libusb-1.0 to libusbx.
- Upgraded to C++11 (defined as C++0x for backwards compatibility with gcc < 4.7).
Diffstat (limited to 'heimdall/source')
| -rw-r--r-- | heimdall/source/Heimdall.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/heimdall/source/Heimdall.h b/heimdall/source/Heimdall.h index 88969c2..bea1d73 100644 --- a/heimdall/source/Heimdall.h +++ b/heimdall/source/Heimdall.h @@ -22,8 +22,10 @@ #define HEIMDALL_H
#ifdef OS_WINDOWS
+
#include <Windows.h>
#undef GetBinaryType
+
#else
#include "../config.h"
@@ -37,4 +39,12 @@ #endif
+#if (!(defined _MSC_VER) || (_MSC_VER < 1700))
+
+#ifndef nullptr
+#define nullptr 0
+#endif
+
+#endif
+
#endif
|