Implement on screen numbering for Subequation module

[features.git] / src / support / os_win32.h

diff --git a/src/support/os_win32.h b/src/support/os_win32.h
index 6f92b90abbd28ddca89fe1fe6b9e1816208525d7..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 {
@@ -79,7 +82,7 @@ public:
        ~GetFolderPath();
 
        /** Wrapper for SHGetFolderPathA, returning
-        *  the path asscociated with @c id in utf8 encoding.
+        *  the path associated with @c id in utf8 encoding.
         */
        std::string const operator()(folder_id id) const;
 private: