Update gcc build instructions. Mention gettext is GPL.

[~andy/gtk] / gtk / gtkfontsel.c

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 1fdf303a8a003ddde843fbe0640f8e81f2c3f4c2..36eaf9b4d087cd3125028bf4bfcbea523ee98e91 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -70,7 +70,14 @@
 #include <ctype.h>
 
 #include "gdk/gdk.h"
+/* Protect against the CHARSET struct in Win32 */
+#if GDK_WINDOWING == GDK_WINDOWING_WIN32
+# define CHARSET CHARSETstruct
+#endif
 #include "gdkx.h"
+#if GDK_WINDOWING == GDK_WINDOWING_WIN32
+# undef CHARSET
+#endif
 #include "gdk/gdkkeysyms.h"
 
 #include "gtkbutton.h"
@@ -2675,8 +2682,10 @@ logfont_to_xlfd (const LOGFONT *lfp,
     weight = N_("extrabold");
   else if (lfp->lfWeight >= FW_BOLD)
     weight = N_("bold");
+#ifdef FW_DEMIBOLD
   else if (lfp->lfWeight >= FW_DEMIBOLD)
     weight = N_("demibold");
+#endif
   else if (lfp->lfWeight >= FW_MEDIUM)
     weight = N_("medium");
   else if (lfp->lfWeight >= FW_NORMAL)
@@ -2712,8 +2721,10 @@ logfont_to_xlfd (const LOGFONT *lfp,
        encoding = "chinesebig5";
       else if (lfp->lfCharSet == OEM_CHARSET)
        encoding = "oem";
+#ifdef JOHAB_CHARSET
       else if (lfp->lfCharSet == JOHAB_CHARSET)
        encoding = "johab";
+#endif
       else if (lfp->lfCharSet == HEBREW_CHARSET)
        encoding = "hebrew";
       else if (lfp->lfCharSet == ARABIC_CHARSET)