From 025290929df35c7b077542115be8570810c26b85 Mon Sep 17 00:00:00 2001
From: Fabien Costantini <fabien@onepost.net>
Date: Mon, 13 Oct 2008 23:44:22 +0000
Subject: Fixed missing config.h includes in X11 after QD removal.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6426 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Double_Window.cxx     | 2 +-
 src/Fl_Window_fullscreen.cxx | 2 --
 src/fl_arci.cxx              | 4 +---
 src/fl_font_x.cxx            | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 9264efc86..ffaff2663 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -64,7 +64,7 @@ void Fl_Double_Window::show() {
   Fl_Window::show();
 }
 
-#if defined(X11)
+#if defined(USE_X11)
 
 // maybe someone feels inclined to implement alpha blending on X11?
 char fl_can_do_alpha_blending() {
diff --git a/src/Fl_Window_fullscreen.cxx b/src/Fl_Window_fullscreen.cxx
index c72e70ec0..238033f73 100644
--- a/src/Fl_Window_fullscreen.cxx
+++ b/src/Fl_Window_fullscreen.cxx
@@ -38,9 +38,7 @@
 #include <FL/Fl.H>
 #include <FL/x.H>
 
-#ifdef __APPLE__
 #include <config.h>
-#endif 
 
 void Fl_Window::border(int b) {
   if (b) {
diff --git a/src/fl_arci.cxx b/src/fl_arci.cxx
index f3464e34a..6e9ba744d 100644
--- a/src/fl_arci.cxx
+++ b/src/fl_arci.cxx
@@ -45,9 +45,7 @@
 #ifdef WIN32
 #  include <FL/math.h>
 #endif
-#ifdef __APPLE__
-#  include <config.h>
-#endif
+#include <config.h>
 
 /**
   Draw ellipse sections using integer coordinates.
diff --git a/src/fl_font_x.cxx b/src/fl_font_x.cxx
index 41639bb82..04b3738d8 100644
--- a/src/fl_font_x.cxx
+++ b/src/fl_font_x.cxx
@@ -114,7 +114,7 @@ int fl_correct_encoding(const char* name) {
   return (*c++ && !strcmp(c,fl_encoding));
 }
 
-static char *find_best_font(const char *fname, int size) {
+static const char *find_best_font(const char *fname, int size) {
   int cnt;
   static char **list = NULL;
 // locate or create an Fl_Font_Descriptor for a given Fl_Fontdesc and size:
@@ -189,7 +189,7 @@ static char *put_font_size(const char *n, int size)
         int i = 0;
         char *buf;
         const char *ptr;
-        char *f;
+        const char *f;
         char *name;
         int nbf = 1;
         name = strdup(n);
-- 
cgit v1.2.3