Move Windows-specific stuff into os_win32.h

diff --git a/src/frontends/qt/GuiBox.cpp b/src/frontends/qt/GuiBox.cpp
index 298009da1b0c3691f39c5ed6d2d032ebea1fab5d..0d22aa79638ad8d6bde577207a8424b161598313 100644 (file)
--- a/src/frontends/qt/GuiBox.cpp
+++ b/src/frontends/qt/GuiBox.cpp
@@ -32,10 +32,6 @@
 #include <QLineEdit>
 #include <QPushButton>
 
-#ifdef IN
-#undef IN
-#endif
-
 using namespace std;
 
 

diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index 7e1ec248b142d3a2f3aebaa01f165962df740494..0244bfdfe88236cf2539814085a8d8e79c715458 100644 (file)
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -85,10 +85,6 @@
 #include <sstream>
 #include <vector>
 
-#ifdef IN
-#undef IN
-#endif
-
 
 // a style sheet for buttons
 // this is for example used for the background color setting button

diff --git a/src/support/os_win32.h b/src/support/os_win32.h
index 3f278c3bd0af919cb821608bf3689345341fbfce..a656f6f1822046fd27a848acf85387f445f4ed73 100644 (file)
--- a/src/support/os_win32.h
+++ b/src/support/os_win32.h
@@ -49,6 +49,9 @@
 #include <tchar.h>
 #include <psapi.h>
 
+#ifdef IN
+#undef IN // used in Length::UNIT enum
+#endif
 
 namespace lyx {
 namespace support {