24 files changed, 5 insertions, 493 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake
index 4583a83f1..622c2eb44 100644
--- a/CMake/options.cmake
+++ b/CMake/options.cmake
@@ -115,7 +115,6 @@ if (OPTION_APPLE_SDL)
   find_package (SDL2 REQUIRED)
   if (SDL2_FOUND)
     set (USE_SDL 1)
-    set (FL_PORTING 1)
     list (APPEND FLTK_LDLIBS SDL2_LIBRARY)
   endif (SDL2_FOUND)
 endif (OPTION_APPLE_SDL)
diff --git a/CMake/setup.cmake b/CMake/setup.cmake
index bed59722e..23f20695b 100644
--- a/CMake/setup.cmake
+++ b/CMake/setup.cmake
@@ -100,8 +100,8 @@ if(APPLE)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.8")
      endif(${CMAKE_SYSTEM_VERSION} VERSION_GREATER 16.9.0)
    elseif(OPTION_APPLE_SDL)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__ -DFL_PORTING")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__ -DFL_PORTING")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__")
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__")
    else()
      set(__APPLE_QUARTZ__ 1)
      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")
diff --git a/FL/Fl_Gl_Window_Driver.H b/FL/Fl_Gl_Window_Driver.H
index ccad677b7..4f4d9289c 100644
--- a/FL/Fl_Gl_Window_Driver.H
+++ b/FL/Fl_Gl_Window_Driver.H
@@ -26,10 +26,6 @@
 #ifndef Fl_Gl_Window_Driver_H
 #define Fl_Gl_Window_Driver_H
 
-#if defined(FL_PORTING)
-# pragma message "FL_PORTING: please, derive and implement the Fl_Gl_Window_Driver class for your platform"
-#endif
-
 #include <FL/Fl_Gl_Window.H>
 
 class Fl_Gl_Choice;
diff --git a/FL/Fl_Screen_Driver.H b/FL/Fl_Screen_Driver.H
index 1af64cba7..3a75d2c0c 100644
--- a/FL/Fl_Screen_Driver.H
+++ b/FL/Fl_Screen_Driver.H
@@ -136,9 +136,6 @@ public:
   virtual void release_keyboard() { }
 
   // read raw image from a window or an offscreen buffer
-#if defined(FL_PORTING)
-#  pragma message "FL_PORTING: implement code to read RGB data from screen"
-#endif
   /* Member function read_win_rectangle() supports the public function
    fl_read_image() which captures pixel data either from
    the current window or from an offscreen buffer.
diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H
index 056a4adab..5962a5180 100644
--- a/FL/Fl_Window_Driver.H
+++ b/FL/Fl_Window_Driver.H
@@ -187,9 +187,6 @@ public:
   // --- window printing/drawing helper
   virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left,
                                             Fl_RGB_Image*& bottom, Fl_RGB_Image*& right);
-#if defined(FL_PORTING)
-# pragma message "FL_PORTING: implement scrolling of the screen contents"
-#endif
   virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y,
                      void (*draw_area)(void*, int,int,int,int), void* data) { return 0; }
   static inline Fl_Window_Driver* driver(const Fl_Window *win) {return win->pWindowDriver;}
diff --git a/FL/platform.H b/FL/platform.H
index 2df6566b0..2944e9333 100644
--- a/FL/platform.H
+++ b/FL/platform.H
@@ -39,12 +39,6 @@ class Fl_Window;
 #    include "win32.H"
 #  elif defined(__APPLE__)
 #    include "mac.H"
-#  elif defined(USE_SDL)
-#    pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals"
-#    include "porting.H"
-#  elif defined(FL_PORTING)
-#    pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals"
-#    include "porting.H"
 #  elif defined(__ANDROID__)
 #    include "android.H"
 #  else // X11
diff --git a/FL/platform_types.h b/FL/platform_types.h
index d90e37afa..771f611a9 100644
--- a/FL/platform_types.h
+++ b/FL/platform_types.h
@@ -134,24 +134,6 @@ typedef struct __GLXcontextRec *GLContext;
 #include <sys/types.h>
 #include <dirent.h>
 
-
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: define OS-dependent types"
-typedef void* Fl_Offscreen;
-typedef void* Fl_Bitmask;
-typedef void *Fl_Region;
-typedef int FL_SOCKET;
-typedef void *GLContext;
-# pragma message "FL_PORTING: define struct dirent and implement scandir() for the platform"
-struct dirent {char d_name[1];};
-# pragma message "FL_PORTING: define struct stat and implement Fl_XXX_System_Driver::stat() for the platform"
-struct stat { /* the FLTK source code uses part of the stat() API */
-  unsigned st_mode;
-  unsigned st_size;
-};
-#define        S_IFDIR  0040000  /* directory */
-#define        S_IFREG  0100000  /* regular */
-
 #else /* X11 */
 
 typedef unsigned long Fl_Offscreen;
diff --git a/FL/porting.H b/FL/porting.H
deleted file mode 100644
index c1b586f48..000000000
--- a/FL/porting.H
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// "$Id$"
-//
-// Template header file for the Fast Light Tool Kit (FLTK).
-//
-// Copyright 2016-2018 by Bill Spitzak and others.
-//
-// This library is free software. Distribution and use rights are outlined in
-// the file "COPYING" which should have been included with this file.  If this
-// file is missing or damaged, see the license at:
-//
-//     http://www.fltk.org/COPYING.php
-//
-// Please report all bugs and problems on the following page:
-//
-//     http://www.fltk.org/str.php
-//
-
-// Do not directly include this file, instead use <FL/platform.H>.
-
-// These types and variables give access to internal, platform-specific data through the public API.
-// They require to include platform.H (in contrast to types defined in platform_types.h)
-
-#if !defined(FL_PLATFORM_H)
-#  error "Never use <FL/porting.H> directly; include <FL/platform.H> instead."
-#endif // !FL_PLATFORM_H
-
-typedef void *Window; // used by fl_find(), fl_xid() and class Fl_X
-
-/* Reference to the current device context
- For back-compatibility only. The preferred procedure to get this reference is
- Fl_Surface_Device::surface()->driver()->gc().
- */
-extern void *fl_gc;
-
-//
-// End of "$Id$".
-//
diff --git a/cairo/Fl_Cairo.cxx b/cairo/Fl_Cairo.cxx
index 7ddc87fa2..f94e1edf3 100644
--- a/cairo/Fl_Cairo.cxx
+++ b/cairo/Fl_Cairo.cxx
@@ -32,8 +32,6 @@
 #  include <cairo-win32.h>
 #elif defined(__APPLE_QUARTZ__) // PORTME: Cairo Support
 #  include <cairo-quartz.h>
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: is the Cairo library available on this platform?"
 #else
 #  error Cairo is not supported on this platform.
 #endif
diff --git a/configh.cmake.in b/configh.cmake.in
index 794d74980..f00bad328 100644
--- a/configh.cmake.in
+++ b/configh.cmake.in
@@ -177,15 +177,6 @@
 #cmakedefine USE_SDL 1
 
 /*
- * FL_PORTING
- *
- * A little helper that points to locations in the core that still need
- * to be ported to the core driver setup.
- */
-
-#cmakedefine FL_PORTING 1
-
-/*
  * HAVE_OVERLAY:
  *
  * Use the X overlay extension?  FLTK will try to use an overlay
diff --git a/configh.in b/configh.in
index 121e48edc..dcb8b5b8c 100644
--- a/configh.in
+++ b/configh.in
@@ -177,16 +177,6 @@
 #undef USE_SDL
 
 /*
- * FL_PORTING
- *
- * A little helper that points to locations in the core that still need
- * to be ported to the core driver setup.
- * *FIXME* Not yet implemented in configure !
- */
-
-#undef FL_PORTING
-
-/*
  * HAVE_OVERLAY:
  *
  * Use the X overlay extension?  FLTK will try to use an overlay
diff --git a/src/Fl_Gl_Choice.H b/src/Fl_Gl_Choice.H
index 3ef4c5a30..bdee1c6c8 100644
--- a/src/Fl_Gl_Choice.H
+++ b/src/Fl_Gl_Choice.H
@@ -64,11 +64,6 @@
 #endif // FL_CFG_GFX_GDI
 
 
-#if defined(FL_PORTING) && !defined(FL_GL_CHOICE_PLATFORM_SPECIFIC_MEMBERS)
-#  pragma message "Define platform-specific members of the Fl_Gl_Choice class"
-#  define FL_GL_CHOICE_PLATFORM_SPECIFIC_MEMBERS
-#endif
-
 // Describes crap needed to create a GLContext.
 class Fl_Gl_Choice {
   friend class Fl_Gl_Window_Driver;
diff --git a/src/Fl_Printer.cxx b/src/Fl_Printer.cxx
index c9f0d2a2c..bf5ee9082 100644
--- a/src/Fl_Printer.cxx
+++ b/src/Fl_Printer.cxx
@@ -20,11 +20,6 @@
 #include <FL/Fl_Printer.H>
 #include <config.h>
 
-#ifdef FL_PORTING
-#  pragma message "FL_PORTING: implement print support for your platform, or define FL_NO_PRINT_SUPPORT"
-#define FL_NO_PRINT_SUPPORT 1
-#endif
-
 #if defined(FL_NO_PRINT_SUPPORT)
 #include <FL/Fl_PostScript.H>
 
diff --git a/src/Fl_porting.cxx b/src/Fl_porting.cxx
deleted file mode 100644
index 649824163..000000000
--- a/src/Fl_porting.cxx
+++ /dev/null
@@ -1,342 +0,0 @@
-//
-// "$Id$"
-//
-// core code stubs for the Fast Light Tool Kit (FLTK).
-//
-// Copyright 1998-2015 by Bill Spitzak and others.
-//
-// This library is free software. Distribution and use rights are outlined in
-// the file "COPYING" which should have been included with this file.  If this
-// file is missing or damaged, see the license at:
-//
-//     http://www.fltk.org/COPYING.php
-//
-// Please report all bugs and problems on the following page:
-//
-//     http://www.fltk.org/str.php
-//
-
-#ifndef FL_DOXYGEN
-#include <FL/Fl.H>
-#include <FL/fl_utf8.h>
-#include <FL/Fl_Window.H>
-#include <FL/fl_draw.H>
-#include <FL/Enumerations.H>
-#include <FL/Fl_Tooltip.H>
-#include <FL/Fl_Paged_Device.H>
-#include "flstring.h"
-#include "Fl_Font.H"
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <time.h>
-#include <signal.h>
-
-extern unsigned int fl_codepage;
-
-Fl_Fontdesc* fl_fonts = NULL;
-
-void *fl_gc = NULL;
-
-Window fl_window = NULL;
-
-void fl_set_status(int x, int y, int w, int h)
-{
-#  pragma message "FL_PORTING: implement fl_set_status"
-}
-
-void Fl::add_fd(int n, int events, void (*cb)(FL_SOCKET, void*), void *v) {
-#  pragma message "FL_PORTING: implement Fl::add_fd"
-}
-
-void Fl::add_fd(int fd, void (*cb)(FL_SOCKET, void*), void* v) {
-#  pragma message "FL_PORTING: implement Fl::add_fd"
-}
-
-void Fl::remove_fd(int n, int events) {
-#  pragma message "FL_PORTING: implement Fl::remove_fd"
-}
-
-void Fl::remove_fd(int n) {
-#  pragma message "FL_PORTING: implement Fl::remove_fd"
-}
-
-static void nothing() {}
-void (*fl_lock_function)() = nothing;
-void (*fl_unlock_function)() = nothing;
-
-//void* Fl::thread_message() {
-//#  pragma message "FL_PORTING: implement Fl::thread_message"
-//}
-
-int fl_wait(double time_to_wait) {
-#  pragma message "FL_PORTING: implement fl_wait"
-  Fl::flush();
-  return 0;
-}
-
-int fl_ready() {
-#  pragma message "FL_PORTING: implement fl_ready"
-  return 0;
-}
-
-void fl_open_display() {
-#  pragma message "FL_PORTING: implement fl_open_display()"
-}
-
-void Fl::enable_im() {
-#  pragma message "FL_PORTING: implement Fl::enable_im"
-}
-
-void Fl::disable_im() {
-#  pragma message "FL_PORTING: implement Fl::disable_im"
-}
-
-int Fl::x()
-{
-#  pragma message "FL_PORTING: implement Fl::x"
-  return 0;
-}
-
-int Fl::y()
-{
-#  pragma message "FL_PORTING: implement Fl::y"
-  return 0;
-}
-
-int Fl::h()
-{
-#  pragma message "FL_PORTING: implement Fl::h"
-  return 600;
-}
-
-int Fl::w()
-{
-#  pragma message "FL_PORTING: implement Fl::w"
-  return 800;
-}
-
-char *fl_selection_buffer[2];
-int fl_selection_length[2];
-int fl_selection_buffer_length[2];
-char fl_i_own_selection[2];
-
-void fl_update_clipboard(void) {
-#  pragma message "FL_PORTING: implement fl_update_clipboard"
-}
-
-// call this when you create a selection:
-void Fl::copy(const char *stuff, int len, int clipboard, const char *type) {
-#  pragma message "FL_PORTING: implement Fl::copy"
-}
-
-// Call this when a "paste" operation happens:
-void Fl::paste(Fl_Widget &receiver, int clipboard, const char *type) {
-#  pragma message "FL_PORTING: implement Fl::paste"
-}
-
-int Fl::clipboard_contains(const char *type)
-{
-#  pragma message "FL_PORTING: implement Fl::clipboard_contains"
-  return 0;
-}
-
-void fl_get_codepage()
-{
-#  pragma message "FL_PORTING: implement fl_get_codepage"
-}
-
-int Fl_X::fake_X_wm(const Fl_Window* w,int &X,int &Y, int &bt,int &bx, int &by) {
-#  pragma message "FL_PORTING: don't ask. We do't know either..."
-  return 0;
-}
-
-void Fl_Window::resize(int X,int Y,int W,int H) {
-#  pragma message "FL_PORTING: implement Fl_Window::resize"
-}
-
-//void Fl_X::make_fullscreen(int X, int Y, int W, int H) {
-//#  pragma message "FL_PORTING: implement Fl_X::make_fullscreen"
-//}
-
-void Fl_Window::fullscreen_x() {
-#  pragma message "FL_PORTING: implement Fl_Window::fullscreen_x"
-}
-
-void Fl_Window::fullscreen_off_x(int X, int Y, int W, int H) {
-#  pragma message "FL_PORTING: implement Fl_Window::fullscreen_off_x"
-}
-
-void fl_fix_focus(); // in Fl.cxx
-
-char fl_show_iconic;
-int fl_disable_transient_for; // secret method of removing TRANSIENT_FOR
-
-Fl_X* Fl_X::make(Fl_Window* w) {
-#  pragma message "FL_PORTING: implement Fl_X::make"
-  return 0;
-}
-
-void Fl::add_timeout(double time, Fl_Timeout_Handler cb, void* data)
-{
-#  pragma message "FL_PORTING: implement Fl::add_timeout"
-}
-
-void Fl::repeat_timeout(double time, Fl_Timeout_Handler cb, void* data)
-{
-#  pragma message "FL_PORTING: implement Fl::repeat_timeout"
-}
-
-int Fl::has_timeout(Fl_Timeout_Handler cb, void* data)
-{
-#  pragma message "FL_PORTING: implement Fl::has_timeout"
-  return 0;
-}
-
-void Fl::remove_timeout(Fl_Timeout_Handler cb, void* data)
-{
-#  pragma message "FL_PORTING: implement Fl::remove_timeout"
-}
-
-void Fl_Window::size_range_() {
-  size_range_set = 1;
-}
-
-#include <FL/filename.H> // need so FL_EXPORT fl_filename_name works
-
-// returns pointer to the filename, or null if name ends with '/'
-const char *fl_filename_name(const char *name) {
-#  pragma message "FL_PORTING: implement fl_filename_name"
-  return 0;
-}
-
-void Fl_Window::label(const char *name,const char *iname) {
-#  pragma message "FL_PORTING: implement Fl_Window::label"
-}
-
-void Fl_X::set_default_icons(const Fl_RGB_Image *icons[], int count) {
-#  pragma message "FL_PORTING: implement Fl_X::set_defult_icons"
-}
-
-void Fl_X::set_icons() {
-#  pragma message "FL_PORTING: implement Fl_X::set_icons"
-}
-
-int Fl_X::set_cursor(Fl_Cursor c) {
-#  pragma message "FL_PORTING: implement Fl_X::set_cursor"
-  return 1;
-}
-
-int Fl_X::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) {
-#  pragma message "FL_PORTING: implement Fl_X::set_cursor"
-  return 1;
-}
-
-void Fl_Window::show() {
-#  pragma message "FL_PORTING: implement Fl_Window::show"
-}
-
-Fl_Window *Fl_Window::current_;
-
-void Fl_Window::make_current() {
-#  pragma message "FL_PORTING: implement Fl_Window::make_current"
-}
-
-void fl_free_fonts(void)
-{
-#  pragma message "FL_PORTING: implement fl_free_fonts"
-}
-
-
-//Fl_Region XRectangleRegion(int x, int y, int w, int h) {
-//}
-
-FL_EXPORT Window fl_xid_(const Fl_Window *w) {
-  Fl_X *temp = Fl_X::i(w);
-  return temp ? temp->xid : 0;
-}
-
-int Fl_Window::decorated_w()
-{
-  return w();
-}
-
-int Fl_Window::decorated_h()
-{
-  return h();
-}
-
-void Fl_Paged_Device::print_window(Fl_Window *win, int x_offset, int y_offset)
-{
-#  pragma message "FL_PORTING: implement Fl_Paged_Device::print_window"
-}
-
-//void Fl_Paged_Device::draw_decorated_window(Fl_Window *win, int x_offset, int y_offset, Fl_Surface_Device *toset)
-//{
-//}
-
-Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data)
-{
-#  pragma message "FL_PORTING: implement fl_create_bitmask"
-  return 0;
-}
-
-//Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data)
-//{
-//#  pragma message "FL_PORTING: implement fl_create_alphamask"
-//  return 0;
-//}
-
-void fl_delete_bitmask(Fl_Bitmask bm)
-{
-#  pragma message "FL_PORTING: implement fl_delete_bitmask"
-}
-
-Fl_Offscreen fl_create_offscreen(int w, int h)
-{
-#  pragma message "FL_PORTING: implement fl_create_offscreen"
-  return 0;
-}
-
-//void fl_copy_offscreen(int x,int y,int w,int h, Fl_Offscreen gWorld, int srcx,int srcy)
-//{
-//#  pragma message "FL_PORTING: implement fl_copy_offscreen"
-//}
-
-void fl_delete_offscreen(Fl_Offscreen gWorld)
-{
-#  pragma message "FL_PORTING: implement fl_delete_offscreen"
-}
-
-void fl_begin_offscreen(Fl_Offscreen gWorld)
-{
-#  pragma message "FL_PORTING: implement fl_begin_offscreen"
-}
-
-void fl_end_offscreen()
-{
-#  pragma message "FL_PORTING: implement fl_end_offscreen"
-}
-
-Fl_Font_Descriptor::~Fl_Font_Descriptor()
-{
-#  pragma message "FL_PORTING: implement Fl_Font_Descriptor::~Fl_Font_Descriptor"
-}
-
-int Fl::dnd()
-{
-#  pragma message "FL_PORTING: implement Fl::dnd"
-  return 0;
-}
-
-void Fl::get_mouse(int &x, int &y)
-{
-#  pragma message "FL_PORTING: implement Fl::get_mouse"
-  x = 0; y = 0;
-}
-
-#endif // FL_DOXYGEN
-
-//
-// End of "$Id$".
-//
diff --git a/src/config_lib.h b/src/config_lib.h
index bef665b71..b4a80e918 100644
--- a/src/config_lib.h
+++ b/src/config_lib.h
@@ -25,8 +25,6 @@
 # ifdef HAVE_GL
 #  define FL_CFG_GFX_OPENGL
 # endif
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: please choose a core graphics library"
 #elif defined(USE_X11) /* X11 */
 # define FL_CFG_GFX_XLIB
 # ifdef HAVE_GL
@@ -44,8 +42,6 @@
 # define FL_CFG_PRN_QUARTZ
 #elif defined(_WIN32)
 # define FL_CFG_PRN_WIN32
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: please choose a printer driver"
 #elif defined(USE_X11) /* X11 */
 # define FL_CFG_PRN_PS
 #endif
@@ -60,8 +56,6 @@
 # define FL_CFG_WIN_COCOA
 #elif defined(_WIN32)
 # define FL_CFG_WIN_WIN32
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: please choose a window management library"
 #elif defined(USE_X11) /* X11 */
 # define FL_CFG_WIN_X11
 #endif
@@ -76,8 +70,6 @@
 # define FL_CFG_SYS_POSIX
 #elif defined(_WIN32)
 # define FL_CFG_SYS_WIN32
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: please choose a system library"
 #elif defined(USE_X11) /* X11 */
 # define FL_CFG_SYS_POSIX
 #endif
diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
index 781e3be6e..fa9414ca3 100644
--- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
+++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
@@ -93,10 +93,6 @@ Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window* glw,
 
 #else
 
-#if defined(FL_PORTING)
-#  pragma message "FL_PORTING: check whether the default Fl_OpenGL_Display_Device::capture_gl_rectangle() works for your platform"
-#endif
-
 #include <FL/Fl_Screen_Driver.H>
 #include <FL/Fl_Window_Driver.H>
 Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window *glw, int x, int y, int w, int h)
diff --git a/src/drivers/Pico/Fl_Pico_Graphics_Driver.H b/src/drivers/Pico/Fl_Pico_Graphics_Driver.H
index e19d1fe13..c8eb0e678 100644
--- a/src/drivers/Pico/Fl_Pico_Graphics_Driver.H
+++ b/src/drivers/Pico/Fl_Pico_Graphics_Driver.H
@@ -81,7 +81,6 @@ class Fl_Pico_Graphics_Driver : public Fl_Graphics_Driver {
 //#endif
 //  matrix *fl_matrix; /**< Points to the current coordinate transformation matrix */
 //
-//  // === all code below in this class has been to the reorganisation FL_PORTING process
 //public:
 //  Fl_Graphics_Driver();
 //  virtual ~Fl_Graphics_Driver() { if (p) free(p); }
diff --git a/src/fl_call_main.c b/src/fl_call_main.c
index 6fa541a55..48bf9a801 100644
--- a/src/fl_call_main.c
+++ b/src/fl_call_main.c
@@ -37,12 +37,6 @@
  * Microsoft(r) Windows(r) that allows for it.
  */
 
-#if defined(_WIN32) || defined(__APPLE__) /* PORTME: Fl_System_Driver - platform main() */
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: implement 'main()' here if your platform provides another app entry point"
-#else
-#endif
-
 #if defined(_WIN32) && !defined(FL_DLL) && !defined (__GNUC__)
 
 #  include <windows.h>
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index 51920502a..91fabc0ab 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -32,9 +32,6 @@
  */
 
 #include "config_lib.h"
-#if defined(FL_PORTING)
-#  pragma message "FL_PORTING: implement OpenGL text rendering here"
-#endif // defined(FL_PORTING)
 
 #if HAVE_GL || defined(FL_DOXYGEN)
 
diff --git a/src/xutf8/lcUniConv/cp936ext.h b/src/xutf8/lcUniConv/cp936ext.h
index e1a524d44..6c4763833 100644
--- a/src/xutf8/lcUniConv/cp936ext.h
+++ b/src/xutf8/lcUniConv/cp936ext.h
@@ -20,10 +20,6 @@
 
   /* not needed */
 
-#elif defined(FL_PORTING)
-
-#  pragma message "FL_PORTING: include the character encoding file below if needed"
-
 #else
 
 #ifndef CP936
diff --git a/test/blocks.cxx b/test/blocks.cxx
index 029133e5b..c7d3979ed 100644
--- a/test/blocks.cxx
+++ b/test/blocks.cxx
@@ -34,12 +34,6 @@
 // Audio headers...
 #include <config.h>
 
-#if defined(_WIN32) || defined(__APPLE__)
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: FLTK does not provide cross platform sound support"
-#else
-#endif
-
 #ifndef _WIN32
 #  include <unistd.h>
 #  include <sys/time.h> // gettimeofday()
diff --git a/test/color_chooser.cxx b/test/color_chooser.cxx
index 5c80251a7..0c998034d 100644
--- a/test/color_chooser.cxx
+++ b/test/color_chooser.cxx
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(FL_PORTING) && !defined(__ANDROID__)
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
 #include "list_visuals.cxx"
 #endif
 
@@ -114,7 +114,7 @@ int main(int argc, char ** argv) {
            " - : default visual\n"
            " r : call Fl::visual(FL_RGB)\n"
            " c : call Fl::own_colormap()\n",argv[0]);
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(FL_PORTING) && !defined(__ANDROID__)
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
     printf(" # : use this visual with an empty colormap:\n");
     list_visuals();
 #endif
@@ -127,7 +127,7 @@ int main(int argc, char ** argv) {
     } else if (argv[i][0] == 'c') {
       Fl::own_colormap();
     } else if (argv[i][0] != '-') {
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(FL_PORTING) && !defined(__ANDROID__)
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
       int visid = atoi(argv[i]);
       fl_open_display();
       XVisualInfo templt; int num;
diff --git a/test/list_visuals.cxx b/test/list_visuals.cxx
index a4516afcf..ebda7ef8e 100644
--- a/test/list_visuals.cxx
+++ b/test/list_visuals.cxx
@@ -33,10 +33,6 @@ int main(int, char**) {
   return 1;
 }
 
-#elif defined(FL_PORTING)
-
-#  pragma message "FL_PORTING: list_visuals"
-
 #else
 
 #include <config.h>
diff --git a/test/sudoku.cxx b/test/sudoku.cxx
index 14255daab..174061515 100644
--- a/test/sudoku.cxx
+++ b/test/sudoku.cxx
@@ -46,12 +46,6 @@
 #  include <unistd.h>
 #endif // !_WIN32
 
-#if defined(_WIN32) || defined(__APPLE__)
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: FLTK does not provide cross platform sound support"
-#else
-#endif
-
 #ifdef HAVE_ALSA_ASOUNDLIB_H
 #  define ALSA_PCM_NEW_HW_PARAMS_API
 #  include <alsa/asoundlib.h>