|
|
commit 3f2166ea9118a8606ba43a9fa11afb41d1fbaa9b
Author: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Tue Jan 4 18:36:45 2022 +0100
Commit: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Tue Jan 4 18:36:56 2022 +0100
Introduction of FL/fl_config.h - continued
FL/platform.H | 5 ++---
FL/platform_types.h | 4 +++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git FL/platform.H FL/platform.H
index b1a61c0..f70550b 100644
--- FL/platform.H
+++ FL/platform.H
@@ -28,9 +28,8 @@
#if !defined(FL_PLATFORM_H) && !defined(FL_DOXYGEN)
# define FL_PLATFORM_H
-# include <FL/fl_config.h>
# include <FL/Fl_Export.H>
-# include <FL/platform_types.h>
+# include <FL/platform_types.h> // will bring in FL/fl_config.h
# include <FL/fl_types.h> // for uchar
class Fl_Window;
@@ -40,7 +39,7 @@ class Fl_Window;
# include "mac.H"
# elif defined(__ANDROID__)
# include "android.H"
-# else // X11
+# elif defined(FLTK_USE_X11)
# include <FL/fl_types.h>
# include <FL/Enumerations.H>
# if defined(_ABIN32) || defined(_ABI64) // fix for broken SGI Irix X .h files
diff --git FL/platform_types.h FL/platform_types.h
index 9b3fa84..cafeae0 100644
--- FL/platform_types.h
+++ FL/platform_types.h
@@ -46,6 +46,8 @@ typedef opaque GLContext; /**< an OpenGL graphics context, into which all OpenGL
#ifndef FL_PLATFORM_TYPES_H
#define FL_PLATFORM_TYPES_H
+#include <FL/fl_config.h>
+
/* Platform-dependent types are defined here.
These types must be defined by any platform:
Fl_Offscreen, Fl_Bitmask, Fl_Region, FL_SOCKET, GLContext, struct dirent, struct stat,
@@ -136,7 +138,7 @@ typedef struct __GLXcontextRec *GLContext;
#include <sys/types.h>
#include <dirent.h>
-#else /* X11 */
+#elif defined(FLTK_USE_X11)
typedef unsigned long Fl_Offscreen;
typedef unsigned long Fl_Bitmask;
[ Direct Link to Message ] | |
|
| |