wip: fork

1 files changed, 6 insertions, 42 deletions

diff --git a/FL/platform_types.h b/FL/platform_types.h
index 67656b72a..0109050cb 100644
--- a/FL/platform_types.h
+++ b/FL/platform_types.h
@@ -37,31 +37,19 @@ typedef opaque fl_uintptr_t;
 
 /**
  Platform-specific value representing an offscreen drawing buffer.
-  \note This value can be safely cast to these types on each platform:
-  \li X11: Pixmap
-  \li Wayland: cairo_t *
-  \li Windows: HBITMAP
-  \li macOS:  CGContextRef
+  \note This value can be safely cast to Pixmap on X11.
  */
 typedef opaque Fl_Offscreen;
 
 /**
  Pointer to a platform-specific structure representing a collection of rectangles.
-  \note This pointer can be safely cast to these types on each platform:
-  \li X11: Region as defined by X11
-  \li Wayland:  cairo_region_t *
-  \li Windows: HRGN
-  \li macOS:  struct flCocoaRegion *
+  \note This pointer can be safely cast to Region as defined by X11.
  */
 typedef struct opaque *Fl_Region;
 typedef opaque FL_SOCKET; /**< socket or file descriptor */
 /**
  Pointer to a platform-specific structure representing the window's OpenGL rendering context.
-  \note This pointer can be safely cast to these types on each platform:
-  \li X11: GLXContext
-  \li Wayland: EGLContext
-  \li Windows: HGLRC
-  \li macOS: NSOpenGLContext *
+  \note This pointer can be safely cast to GLXContext on X11.
  */
 typedef struct opaque *GLContext;
 
@@ -72,8 +60,8 @@ typedef struct opaque *GLContext;
  */
 typedef opaque Fl_Timestamp;
 
-#  define FL_COMMAND  opaque   /**< An alias for FL_CTRL on Windows and X11, or FL_META on MacOS X */
-#  define FL_CONTROL  opaque   /**< An alias for FL_META on Windows and X11, or FL_CTRL on MacOS X */
+#  define FL_COMMAND  opaque   /**< An alias for FL_CTRL on X11 */
+#  define FL_CONTROL  opaque   /**< An alias for FL_META on X11 */
 
 #else /* FL_DOXYGEN */
 
@@ -95,40 +83,16 @@ typedef opaque Fl_Timestamp;
     different signedness of socket numbers on *some* platforms.
  */
 
-#ifdef _WIN64
-
-#if defined(_MSC_VER) && (_MSC_VER < 1600)
-# include <stddef.h>  /* stdint.h not available before VS 2010 (1600) */
-#else
-# include <stdint.h>
-#endif
-
-typedef intptr_t fl_intptr_t;
-typedef uintptr_t fl_uintptr_t;
-
-#else /* ! _WIN64 */
-
 typedef long fl_intptr_t;
 typedef unsigned long fl_uintptr_t;
 
-#endif /* _WIN64 */
-
 typedef void *GLContext;
 typedef void *Fl_Region;
 typedef fl_uintptr_t  Fl_Offscreen;
 
-/* Allows all hybrid combinations except WIN32 + X11 with MSVC */
-#if defined(_WIN32) && !defined(__MINGW32__)
-  struct dirent {char d_name[1];};
-#else
-#  include <dirent.h>
-#endif
+#include <dirent.h>
 
-# if defined(_WIN64) && defined(_MSC_VER)
-typedef  unsigned __int64 FL_SOCKET;    /* *FIXME* - FL_SOCKET (see above) */
-# else
 typedef  int FL_SOCKET;
-# endif
 
 #include <FL/Fl_Export.H>
 extern FL_EXPORT int fl_command_modifier();