mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use parenthesis for "#if defined foo" -> "#if defined(foo)" - portability.

Browse Source 
Use ANSI C comments in flstring.h, which is included from both C++ and
C code.

Move prototypes for OSX inside existing "C" wrapper in flstring.h.

Simplify M_PI and M_SQRT2 definitions in FL/math.h; no need to define
them twice...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2537 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-07-17 15:23:58 +00:00
parent dfefc7b244
commit 629f327382
5 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
FL/Fl_Menu_Item.H
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.3 2002/07/17 06:09:25 matthiaswm Exp $"
// "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.4 2002/07/17 15:23:57 easysw Exp $"
//
// Menu item header file for the Fast Light Tool Kit (FLTK).
//
@ -31,8 +31,8 @@
#include "Fl_Widget.H"
#endif
#if defined __APPLE__ && defined __MWERKS__
# undef check
#if defined(__APPLE__) && defined(__MWERKS__) && defined(check)
# undef check
#endif
enum { // values for flags:
@ -157,5 +157,5 @@ enum { // back-compatability enum:
#endif
//
// End of "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.3 2002/07/17 06:09:25 matthiaswm Exp $".
// End of "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.4 2002/07/17 15:23:57 easysw Exp $".
//

27
FL/math.h
View File

@ -1,5 +1,5 @@
//
// "$Id: math.h,v 1.4.2.4.2.4 2002/07/17 06:09:25 matthiaswm Exp $"
// "$Id: math.h,v 1.4.2.4.2.5 2002/07/17 15:23:58 easysw Exp $"
//
// Math header file for the Fast Light Tool Kit (FLTK).
//
@ -29,31 +29,20 @@
# include <math.h>
# if defined __APPLE__ && defined __MWERKS__
# ifndef M_PI
# define M_PI 3.14159265358979323846
# define M_PI_2 1.57079632679489661923
# define M_PI_4 0.78539816339744830962
# define M_1_PI 0.31830988618379067154
# define M_2_PI 0.63661977236758134308
# endif // !M_PI
# ifndef M_SQRT2
# define M_SQRT2 1.41421356237309504880
# define M_SQRT1_2 0.70710678118654752440
# endif // !M_SQRT2
# endif
# ifdef WIN32
// things missing from <math.h>:
# define M_PI 3.14159265358979323846
# define M_PI_2 1.57079632679489661923
# define M_PI_4 0.78539816339744830962
# define M_1_PI 0.31830988618379067154
# define M_2_PI 0.63661977236758134308
# define M_SQRT2 1.41421356237309504880
# define M_SQRT1_2 0.70710678118654752440
# elif defined(__EMX__)
# ifdef __EMX__
# include <float.h>
# endif
@ -68,5 +57,5 @@ inline double copysign(double a, double b) {return b<0 ? -a : a;}
//
// End of "$Id: math.h,v 1.4.2.4.2.4 2002/07/17 06:09:25 matthiaswm Exp $".
// End of "$Id: math.h,v 1.4.2.4.2.5 2002/07/17 15:23:58 easysw Exp $".
//

9
src/Fl_File_Browser.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_File_Browser.cxx,v 1.1.2.19 2002/07/17 06:09:25 matthiaswm Exp $"
// "$Id: Fl_File_Browser.cxx,v 1.1.2.20 2002/07/17 15:23:58 easysw Exp $"
//
// Fl_File_Browser routines.
//
@ -62,12 +62,13 @@
# include <os2.h>
#endif // __EMX__
// CodeWarrior (__MWERKS__) gets its include paths confused, so we temporarily disable this
// CodeWarrior (__MWERKS__) gets its include paths confused, so we
// temporarily disable this...
#if defined(__APPLE__) && !defined(__MWERKS__)
# include <sys/param.h>
# include <sys/ucred.h>
# include <sys/mount.h>
#endif // __APPLE__
#endif // __APPLE__ && !__MWERKS__
//
@ -644,5 +645,5 @@ Fl_File_Browser::filter(const char *pattern) // I - Pattern string
//
// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.19 2002/07/17 06:09:25 matthiaswm Exp $".
// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.20 2002/07/17 15:23:58 easysw Exp $".
//

10
src/Fl_get_system_colors.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.11 2002/07/17 06:09:26 matthiaswm Exp $"
// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.12 2002/07/17 15:23:58 easysw Exp $"
//
// System color support for the Fast Light Tool Kit (FLTK).
//
@ -34,9 +34,9 @@
#include <FL/Fl_Tiled_Image.H>
#include "tile.xpm"
#if defined __APPLE__ && defined __MWERKS__
extern "C" int putenv(const char*);
#endif
#if defined(__APPLE__) && defined(__MWERKS__)
extern "C" int putenv(const char*);
#endif // __APPLE__ && __MWERKS__
void Fl::background(uchar r, uchar g, uchar b) {
@ -317,5 +317,5 @@ int Fl::reload_scheme() {
//
// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.11 2002/07/17 06:09:26 matthiaswm Exp $".
// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.12 2002/07/17 15:23:58 easysw Exp $".
//

27
src/flstring.h
View File

@ -1,5 +1,5 @@
/*
* "$Id: flstring.h,v 1.1.2.9 2002/07/17 06:09:26 matthiaswm Exp $"
* "$Id: flstring.h,v 1.1.2.10 2002/07/17 15:23:58 easysw Exp $"
*
* Common string header file for the Fast Light Tool Kit (FLTK).
*
@ -53,20 +53,22 @@
# define strncasecmp(s,t,n) strnicmp((s), (t), (n))
# endif /* WIN32 */
// MetroWerks' CodeWarrior put thes "non-standard" functions int <extras.h>
// which unfortunatly does not play well otherwise when included - to be resolved
# if defined __APPLE__ && defined __MWERKS__
extern "C" {
int strcasecmp(const char*,const char*);
int strncasecmp(const char*,const char*,int);
char *strdup(const char*);
}
# endif
# ifdef __cplusplus
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__)
int strcasecmp(const char*,const char*);
int strncasecmp(const char*,const char*,int);
char *strdup(const char*);
# endif
# if !HAVE_SNPRINTF
FL_EXPORT extern int fl_snprintf(char *, size_t, const char *, ...);
# define snprintf fl_snprintf
@ -97,6 +99,7 @@ FL_EXPORT extern size_t fl_strlcpy(char *, const char *, size_t);
# endif /* __cplusplus */
#endif /* !flstring_h */
/*
* End of "$Id: flstring.h,v 1.1.2.9 2002/07/17 06:09:26 matthiaswm Exp $".
* End of "$Id: flstring.h,v 1.1.2.10 2002/07/17 15:23:58 easysw Exp $".
*/