diff options
Diffstat (limited to 'ldmicro/lib/linuxUI/linuxLD.h')
| -rw-r--r-- | ldmicro/lib/linuxUI/linuxLD.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ldmicro/lib/linuxUI/linuxLD.h b/ldmicro/lib/linuxUI/linuxLD.h index edaead8..231e499 100644 --- a/ldmicro/lib/linuxUI/linuxLD.h +++ b/ldmicro/lib/linuxUI/linuxLD.h @@ -11,6 +11,7 @@ #include <QSplitter> #include <Qt> #include <sys/mman.h> +#include <iostream> /// common windows referances for linux @@ -28,7 +29,14 @@ #define LDMICRO_ICON "../ldmicro.ico" /// Macro functions -#define max(_A, _B) std::max(_A, _B) +// #define max(_A, _B) std::max(_A, _B) + +/*#define max(_A, _B) { \ + if((_A) > (_B)) \ + return (_A); \ + else \ + return (_B); \ + }*/ /// Typedefs //typedef int64_t __int64; @@ -247,4 +255,6 @@ void RECT_to_GDRECT( void OutputDebugString(char*); double GetTickCount(void); +size_t max(size_t A, size_t B); + #endif
\ No newline at end of file |