mirror of https://github.com/fltk/fltk
Introduction of FL/fl_config.h - continued
This commit is contained in:
parent
e80a2734e8
commit
3f2166ea91
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue