diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-03-29 11:07:29 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-03-29 11:07:29 +0000 |
| commit | 82be53f64d34500f1c4fcf8b14f9ca8ab275458e (patch) | |
| tree | a249bea7333f568633b78e60863deef33edc2fa4 /FL | |
| parent | 38aa53038c414dc079599a4aa9cabb2772400026 (diff) | |
OS X: more references to non-Cocoa builds removed
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7354 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Native_File_Chooser_MAC.H | 4 | ||||
| -rw-r--r-- | FL/filename.H | 11 | ||||
| -rw-r--r-- | FL/mac.H | 2 | ||||
| -rw-r--r-- | FL/math.h | 6 |
4 files changed, 1 insertions, 22 deletions
diff --git a/FL/Fl_Native_File_Chooser_MAC.H b/FL/Fl_Native_File_Chooser_MAC.H index 8697281b7..5336747f3 100644 --- a/FL/Fl_Native_File_Chooser_MAC.H +++ b/FL/Fl_Native_File_Chooser_MAC.H @@ -29,11 +29,7 @@ #ifndef FL_DOXYGEN // PREVENT DOXYGEN'S USE OF THIS FILE // OSX-SPECIFIC NATIVE BROWSER -#ifdef __APPLE_CC__ #include <Carbon/Carbon.h> -#else /*__APPLE_CC__*/ -#include <Carbon.h> -#endif /*__APPLE_CC__*/ #include <config.h> #undef check // necessary for use of Fl::check() diff --git a/FL/filename.H b/FL/filename.H index ec55ce228..06041155a 100644 --- a/FL/filename.H +++ b/FL/filename.H @@ -74,17 +74,6 @@ inline int fl_filename_relative(char *to, const char *from) { return fl_filename struct dirent {char d_name[1];}; -# elif defined(__APPLE__) && defined(__PROJECTBUILDER__) - -/* Apple's ProjectBuilder has the nasty habit of including recursively - * down the file tree. To avoid re-including <FL/dirent.h> we must - * directly include the systems math file. (Plus, I could not find a - * predefined macro for ProjectBuilder builds, so we have to define it - * in the project) - */ -# include <sys/types.h> -# include "/usr/include/dirent.h" - # elif defined(__WATCOMC__) # include <sys/types.h> # include <direct.h> @@ -38,7 +38,6 @@ #include <Carbon/Carbon.h> #include <config.h> -#ifdef __APPLE_COCOA__ #ifndef MAC_OS_X_VERSION_10_3 #define MAC_OS_X_VERSION_10_3 1030 #endif @@ -54,7 +53,6 @@ #ifndef MAC_OS_X_VERSION_MAX_ALLOWED #define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_3 #endif -#endif // __APPLE_COCOA__ #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h #if defined(__LP64__) && __LP64__ @@ -33,11 +33,7 @@ // directly include the systems math file. (Plus, I could not find a // predefined macro for ProjectBuilder builds, so we have to define it // in the project) -# if defined(__APPLE__) && defined(__PROJECTBUILDER__) -# include "/usr/include/math.h" -# else -# include <math.h> -# endif +# include <math.h> # ifdef __EMX__ # include <float.h> |