diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2008-09-19 17:40:20 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2008-09-19 17:40:20 +0000 |
| commit | e8f467b9e3c52914b234d539a113a981c868df53 (patch) | |
| tree | 56b38732c3532dd82f307d693ac49bb437707f23 /FL | |
| parent | c7453106b907771651ba580ead4a3d75f81537f4 (diff) | |
Updating fl_utf8.h references. Fixing copyright date in .fl files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6311 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl.H | 2 | ||||
| -rw-r--r-- | FL/fl_utf8.h | 69 |
2 files changed, 26 insertions, 45 deletions
@@ -33,7 +33,7 @@ #ifndef Fl_H # define Fl_H -# include "fl_utf8.H" +# include "fl_utf8.h" # include "Enumerations.H" # ifndef Fl_Object # define Fl_Object Fl_Widget diff --git a/FL/fl_utf8.h b/FL/fl_utf8.h index f9c084fdb..97c94674f 100644 --- a/FL/fl_utf8.h +++ b/FL/fl_utf8.h @@ -28,53 +28,21 @@ /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/ #ifndef _HAVE_FL_UTF8_HDR_ -# define _HAVE_FL_UTF8_HDR_ -# include <stdio.h> -# include <string.h> -# include <stdlib.h> - -# ifndef FL_EXPORT -# if defined(FL_DLL) && defined(_MSC_VER) -# ifdef FL_LIBRARY -# define FL_EXPORT __declspec(dllexport) -# else -# define FL_EXPORT __declspec(dllimport) -# endif /* FL_LIBRARY */ -# else -# define FL_EXPORT -# endif /* FL_DLL && _MSC_VER */ -# endif /* FL_EXPORT */ - - - -# if __APPLE__ -# include <wchar.h> -# include <sys/stat.h> -# else -# include <sys/types.h> -# include <sys/stat.h> -# ifndef _WIN32 -# include "Xutf8.h" -# include <X11/Xlocale.h> -# include <X11/Xlib.h> -# endif -# include <locale.h> -# endif - +#define _HAVE_FL_UTF8_HDR_ +#include "FL/Fl_Export.H" -# if defined(WIN32) -# include <ctype.h> -# define xchar wchar_t -# else -# if __APPLE__ -# define xchar wchar_t -# else -# define xchar unsigned short -# endif -# endif +#include <stdio.h> +#include <string.h> +#include <stdlib.h> -# if defined(WIN32) && !defined(FL_DLL) +#ifdef WIN32 +# include <sys/types.h> +# include <sys/stat.h> +# include <locale.h> +# include <ctype.h> +# define xchar wchar_t +# ifndef FL_DLL # undef strdup # define strdup _strdup # undef putenv @@ -88,6 +56,19 @@ # undef chdir # define chdir _chdir # endif +#elif defined(__APPLE__) +# include <wchar.h> +# include <sys/stat.h> +# define xchar wchar_t +#else /* X11 */ +# include <sys/types.h> +# include <sys/stat.h> +# include "Xutf8.h" +# include <X11/Xlocale.h> +# include <X11/Xlib.h> +# include <locale.h> +# define xchar unsigned short +#endif # ifdef __cplusplus extern "C" { |