From d5bc94454ec7eb46ddc9093abbdb906d1b3cfdac Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Wed, 7 Aug 2013 23:16:30 -0700 Subject: [PATCH] Don't mess with include order on Linux. --- examples/common/entry/entry_linux.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/common/entry/entry_linux.cpp b/examples/common/entry/entry_linux.cpp index a96bb683..4ba0c54a 100644 --- a/examples/common/entry/entry_linux.cpp +++ b/examples/common/entry/entry_linux.cpp @@ -10,11 +10,10 @@ #define XK_MISCELLANY #define XK_LATIN1 #include +#include // will include X11 which #defines None... Don't mess with order of includes. + #undef None - -#include #include "entry_p.h" - #include #include #include // memset