diff options
| author | Manolo Gouy <Manolo> | 2016-03-31 11:01:07 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-31 11:01:07 +0000 |
| commit | 56e145a1c8cafea814f03cec951bde2753d234f5 (patch) | |
| tree | c774b9e1b5f4822a0c1297b2b9a1a61f629917de /FL/Fl.H | |
| parent | 3ca402b609deca8872bab22e379a4131e3ba41ba (diff) | |
Complete removing platform-dependent code from the Fl.H header file.
Type FL_SOCKET is now declared in Fl_System_Driver.H with all other
platform-dependent public types.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11484 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl.H')
| -rw-r--r-- | FL/Fl.H | 18 |
1 files changed, 1 insertions, 17 deletions
@@ -23,6 +23,7 @@ #ifndef Fl_H # define Fl_H +#include <FL/Fl_System_Driver.H> #ifdef FLTK_HAVE_CAIRO # include <FL/Fl_Cairo.H> #endif @@ -48,23 +49,6 @@ class Fl_Image; struct Fl_Label; class Fl_Screen_Driver; -// Keep avoiding having the socket deps at that level but mke sure it will work in both 32 & 64 bit builds -#if defined(WIN32) && !defined(__CYGWIN__) -# if defined(_WIN64) -# define FL_SOCKET unsigned __int64 -# else -# define FL_SOCKET int -# endif -#elif defined(__APPLE__) // PORTME: Fl_System_Driver - socket types -# define FL_SOCKET int -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: define a type for FL_SOCKET" -# define FL_SOCKET int // default if not ported -# undef check -#else -# define FL_SOCKET int -#endif - // Pointers you can use to change FLTK to a foreign language. // Note: Similar pointers are defined in FL/fl_ask.H and src/fl_ask.cxx |