MacOSX compile fix.

[lyx.git] / src / support / fontutils.C

diff --git a/src/support/fontutils.C b/src/support/fontutils.C
index f0e8ae90fa3d0eb1ce5438e5e249c35c9bd03367..1c807e93e0bc7ab4c14c97bad80fd43d97d459d5 100644 (file)
--- a/src/support/fontutils.C
+++ b/src/support/fontutils.C
@@ -20,11 +20,19 @@
 #include "support/systemcall.h"
 
 #ifdef __APPLE__
+#include "debug.h"
 #include <ApplicationServices/ApplicationServices.h>
+using std::endl;
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) || (defined(__CYGWIN__) && defined(X_DISPLAY_MISSING))
 #include "windows.h"
+#ifdef max
+#undef max
+#endif
+#ifdef min
+#undef min
+#endif
 #include "support/os.h"
 #include "support/package.h"
 #include "support/path.h"
@@ -74,7 +82,7 @@ void addFontResources()
                lyxerr << "FMActivateFonts err = " << err << endl;
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) || (defined(__CYGWIN__) && defined(X_DISPLAY_MISSING))
        // Windows only: Add BaKoMa TrueType font resources
        string const fonts_dir = addPath(package().system_support(), "fonts");
        
@@ -89,7 +97,7 @@ void addFontResources()
 
 void restoreFontResources()
 {
-#ifdef _WIN32
+#if defined(_WIN32) || (defined(__CYGWIN__) && defined(X_DISPLAY_MISSING))
        // Windows only: Remove BaKoMa TrueType font resources
        string const fonts_dir = addPath(package().system_support(), "fonts");