Author: matt
Date: 2010-03-29 03:47:11 -0700 (Mon, 29 Mar 2010)
New Revision: 7352
Log:
Removed Metrowerks support for Apple builds.
Modified:
branches/branch-1.3/src/Fl_File_Browser.cxx
branches/branch-1.3/src/Fl_get_system_colors.cxx
branches/branch-1.3/src/fl_call_main.c
branches/branch-1.3/src/flstring.h
Modified: branches/branch-1.3/src/Fl_File_Browser.cxx
===================================================================
--- branches/branch-1.3/src/Fl_File_Browser.cxx 2010-03-29 10:35:00 UTC (rev
7351)
+++ branches/branch-1.3/src/Fl_File_Browser.cxx 2010-03-29 10:47:11 UTC (rev
7352)
@@ -65,15 +65,12 @@
# 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 @@
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
Modified: branches/branch-1.3/src/Fl_get_system_colors.cxx
===================================================================
--- branches/branch-1.3/src/Fl_get_system_colors.cxx 2010-03-29 10:35:00 UTC
(rev 7351)
+++ branches/branch-1.3/src/Fl_get_system_colors.cxx 2010-03-29 10:47:11 UTC
(rev 7352)
@@ -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...
Modified: branches/branch-1.3/src/fl_call_main.c
===================================================================
--- branches/branch-1.3/src/fl_call_main.c 2010-03-29 10:35:00 UTC (rev
7351)
+++ branches/branch-1.3/src/fl_call_main.c 2010-03-29 10:47:11 UTC (rev
7352)
@@ -51,12 +51,8 @@
# include <windows.h>
# include <stdio.h>
# include <stdlib.h>
-#include <FL/fl_utf8.h>
+# include <FL/fl_utf8.h>
-# ifdef __MWERKS__
-# include <crtl.h>
-# endif
-
extern int main(int, char *[]);
# ifdef BORLAND5
Modified: branches/branch-1.3/src/flstring.h
===================================================================
--- branches/branch-1.3/src/flstring.h 2010-03-29 10:35:00 UTC (rev 7351)
+++ branches/branch-1.3/src/flstring.h 2010-03-29 10:47:11 UTC (rev 7352)
@@ -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
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
