diff options
| author | Jonathan Marshall <jmarshall@never.you.mind> | 2011-06-13 16:11:50 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2011-06-13 16:30:19 +1200 |
| commit | 77b74009d1f101a512cfb94ce5bf50e9da384b5b (patch) | |
| tree | 11af1178efb24e8f5dd1c78a77d53575969edab6 | |
| parent | 95a05666ebeb57429f596a3f7b6c811b1106483e (diff) | |
get rid of #undef min/max now that win32 uses NOMINMAX
| -rw-r--r-- | xbmc/Util.h | 8 | ||||
| -rw-r--r-- | xbmc/cores/DllLoader/DllLoader.cpp | 7 | ||||
| -rw-r--r-- | xbmc/cores/playercorefactory/PlayerCoreFactory.h | 3 |
3 files changed, 0 insertions, 18 deletions
diff --git a/xbmc/Util.h b/xbmc/Util.h index 6cb0bfd991..ed23ecb3d9 100644 --- a/xbmc/Util.h +++ b/xbmc/Util.h @@ -20,17 +20,9 @@ * */ -#ifdef min -#undef min -#endif -#ifdef max -#undef max -#endif - #include <climits> #include <cmath> #include <vector> -#include <limits> #include <string.h> #include <stdint.h> diff --git a/xbmc/cores/DllLoader/DllLoader.cpp b/xbmc/cores/DllLoader/DllLoader.cpp index 67a0761efb..3d0c2e19f6 100644 --- a/xbmc/cores/DllLoader/DllLoader.cpp +++ b/xbmc/cores/DllLoader/DllLoader.cpp @@ -40,13 +40,6 @@ typedef struct _UNICODE_STRING { } UNICODE_STRING, *PUNICODE_STRING; #include "utils/Win32Exception.h" -#ifdef min -#undef min -#endif -#ifdef max -#undef max -#endif - #define DLL_PROCESS_DETACH 0 #define DLL_PROCESS_ATTACH 1 #define DLL_THREAD_ATTACH 2 diff --git a/xbmc/cores/playercorefactory/PlayerCoreFactory.h b/xbmc/cores/playercorefactory/PlayerCoreFactory.h index b2914bbc62..04ac1dc3aa 100644 --- a/xbmc/cores/playercorefactory/PlayerCoreFactory.h +++ b/xbmc/cores/playercorefactory/PlayerCoreFactory.h @@ -21,9 +21,6 @@ * */ -#undef min -#undef max - #include "../IPlayer.h" /*---------------------------------------------------------------------- |