commit f1926251c0a9c8cd0b36feba3deb7fbd692d1a7a
Author: Yuriy Skalko <[email protected]>
Date: Sun Oct 25 08:54:27 2020 +0200
Move Windows-specific stuff into os_win32.h
---
src/frontends/qt/GuiBox.cpp | 4 ----
src/frontends/qt/GuiDocument.cpp | 4 ----
src/support/os_win32.h | 3 +++
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/frontends/qt/GuiBox.cpp b/src/frontends/qt/GuiBox.cpp
index 298009d..0d22aa7 100644
--- 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 7e1ec24..0244bfd 100644
--- 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 3f278c3..a656f6f 100644
--- 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 {
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
