From 8809c5d65dd20895dcae90e9d2af05fd271f2e9e Mon Sep 17 00:00:00 2001 From: Fabien Costantini Date: Thu, 5 Apr 2012 05:12:30 +0000 Subject: Fixed build error in msvs because Fl ref to FULLSCREEN enum was not accessible in Fl_Widget. new inline is_fullscreen() getter has been implemented to avoid a build error with (at least) msvc compilers. Fixed a ton of warnings / problems when bilding on windows 64 bits target with ms toolchain. cleaned up about 200 warnings raised when building win74 targets. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl.H | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'FL/Fl.H') diff --git a/FL/Fl.H b/FL/Fl.H index b373a63de..b01ef1023 100644 --- a/FL/Fl.H +++ b/FL/Fl.H @@ -43,6 +43,16 @@ class Fl_Window; class Fl_Image; struct Fl_Label; +// 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 +#else +# define FL_SOCKET int +#endif /** \defgroup callback_functions Callback function typedefs \brief Typedefs defined in for callback or handler functions passed as function parameters. @@ -81,7 +91,7 @@ typedef void (*Fl_Idle_Handler)(void *data); typedef void (*Fl_Old_Idle_Handler)(); /** Signature of add_fd functions passed as parameters */ -typedef void (*Fl_FD_Handler)(int fd, void *data); +typedef void (*Fl_FD_Handler)(FL_SOCKET fd, void *data); /** Signature of add_handler functions passed as parameters */ typedef int (*Fl_Event_Handler)(int event); -- cgit v1.2.3