From 699bf33e69074c1e11ba31ba3181eb886d98a550 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Mon, 29 Mar 2010 10:47:11 +0000
Subject: [PATCH] Removed Metrowerks support for Apple builds.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7352 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_File_Browser.cxx      |  9 +++------
 src/Fl_get_system_colors.cxx |  4 ----
 src/fl_call_main.c           |  6 +-----
 src/flstring.h               | 12 ------------
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx
index d19a19231..645cdf378 100644
--- a/src/Fl_File_Browser.cxx
+++ b/src/Fl_File_Browser.cxx
@@ -65,14 +65,11 @@
 #  include <os2.h>
 #endif // __EMX__
 
-// CodeWarrior (__MWERKS__) gets its include paths confused, so we
-// temporarily disable this...
-#if defined(__APPLE__) && !defined(__MWERKS__)
+#if defined(__APPLE__)
 #  include <sys/param.h>
 #  include <sys/ucred.h>
 #  include <sys/mount.h>
-#endif // __APPLE__ && !__MWERKS__
-
+#endif // __APPLE__
 
 //
 // FL_BLINE definition from "Fl_Browser.cxx"...
@@ -504,7 +501,7 @@ Fl_File_Browser::load(const char     *directory,// I - Directory to load
 
 	num_files ++;
       }
-#elif defined(__APPLE__) && !defined(__MWERKS__)
+#elif defined(__APPLE__)
     // MacOS X and Darwin use getfsstat() system call...
     int			numfs;	// Number of file systems
     struct statfs	*fs;	// Buffer for file system info
diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx
index 832541ece..c986c60da 100644
--- a/src/Fl_get_system_colors.cxx
+++ b/src/Fl_get_system_colors.cxx
@@ -37,10 +37,6 @@
 #include <FL/Fl_Tiled_Image.H>
 #include "tile.xpm"
 
-#if defined(__APPLE__) && defined(__MWERKS__)
-extern "C" int putenv(const char*);
-#endif // __APPLE__ && __MWERKS__
-
 #if defined(WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
 // Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs
 // on Windows, which is supposed to be POSIX compliant...
diff --git a/src/fl_call_main.c b/src/fl_call_main.c
index 88be74fde..dbca0d84d 100644
--- a/src/fl_call_main.c
+++ b/src/fl_call_main.c
@@ -51,11 +51,7 @@
 #  include <windows.h>
 #  include <stdio.h>
 #  include <stdlib.h>
-#include <FL/fl_utf8.h>
-
-#  ifdef __MWERKS__
-#   include <crtl.h>
-#  endif
+#  include <FL/fl_utf8.h>
 
 extern int main(int, char *[]);
 
diff --git a/src/flstring.h b/src/flstring.h
index 59b43b8ae..78cc5e559 100644
--- a/src/flstring.h
+++ b/src/flstring.h
@@ -68,18 +68,6 @@
 extern "C" {
 #  endif /* __cplusplus */
 
-/*
- * MetroWerks' CodeWarrior put thes "non-standard" functions in
- * <extras.h> which unfortunatly does not play well otherwise
- * when included - to be resolved...
- */
-
-#  if defined(__APPLE__) && defined(__MWERKS__) && defined(_MSL_USING_MW_C_HEADERS)
-int strcasecmp(const char*,const char*);
-int strncasecmp(const char*,const char*,int);
-char *strdup(const char*);
-#  endif
-
 FL_EXPORT extern int fl_snprintf(char *, size_t, const char *, ...);
 #  if !HAVE_SNPRINTF
 #    define snprintf fl_snprintf