diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-01-04 23:09:32 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-01-04 23:09:32 +0000 |
| commit | b1520373aebb3f16e1aad19d253c1ec12439664c (patch) | |
| tree | fc48095864b484ab563a34f65040d00a8a3a9c54 /src/xutf8 | |
| parent | eb1abad3ca43963f7826f067e70bc3a20db352da (diff) | |
Created pseudo code for all FL_PORTED section so that FLTK compiles and links (Xcode, hello, other C flags: -D FL_PORTING -U __APPLE__ -U __APPLE_QUARTZ__)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@10993 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/xutf8')
| -rw-r--r-- | src/xutf8/is_right2left.c | 5 | ||||
| -rw-r--r-- | src/xutf8/keysym2Ucs.c | 6 | ||||
| -rw-r--r-- | src/xutf8/utf8Input.c | 6 | ||||
| -rw-r--r-- | src/xutf8/utf8Utils.c | 6 | ||||
| -rw-r--r-- | src/xutf8/utf8Wrap.c | 6 |
5 files changed, 24 insertions, 5 deletions
diff --git a/src/xutf8/is_right2left.c b/src/xutf8/is_right2left.c index 19685ad5c..193820ee6 100644 --- a/src/xutf8/is_right2left.c +++ b/src/xutf8/is_right2left.c @@ -24,7 +24,10 @@ * This file is required on all platforms for utf8 support */ -#if !defined(WIN32) && !defined(__APPLE__) +#if defined(WIN32) || defined(__APPLE__) +#elif defined(FL_PORTING) +# pragma message "FL_PORTING: do you want to include Xutf8.h? It's written for X11." +#else # include "../Xutf8.h" #endif /* !defined(WIN32) && !defined(__APPLE__) */ diff --git a/src/xutf8/keysym2Ucs.c b/src/xutf8/keysym2Ucs.c index d01a3a751..1629d0934 100644 --- a/src/xutf8/keysym2Ucs.c +++ b/src/xutf8/keysym2Ucs.c @@ -16,7 +16,11 @@ #define KEYSYM2UCS_INCLUDED -#if !defined(WIN32) && !defined(__APPLE__) +#if defined(WIN32) +#elif defined(__APPLE__) +#elif defined(FL_PORTING) +# pragma message "FL_PORTING: do you want to include Xutf8.h?" +#else #include "../Xutf8.h" #include "imKStoUCS.c" diff --git a/src/xutf8/utf8Input.c b/src/xutf8/utf8Input.c index 5682ac7b6..7e21e3f55 100644 --- a/src/xutf8/utf8Input.c +++ b/src/xutf8/utf8Input.c @@ -14,7 +14,11 @@ * http://www.fltk.org/str.php */ -#if !defined(WIN32) && !defined(__APPLE__) +#if defined(WIN32) +#elif defined(__APPLE__) +#elif defined(FL_PORTING) +# pragma message "FL_PORTING: do you want to include Xutf8.h?" +#else #include <config.h> #include "../Xutf8.h" diff --git a/src/xutf8/utf8Utils.c b/src/xutf8/utf8Utils.c index 17d49d34c..7c921906b 100644 --- a/src/xutf8/utf8Utils.c +++ b/src/xutf8/utf8Utils.c @@ -24,7 +24,11 @@ * Unicode to UTF-8 conversion functions. */ -#if !defined(WIN32) && !defined(__APPLE__) +#elif defined(WIN32) +#elif defined(__APPLE__) +#elif defined(FL_PORTING) +# pragma message "FL_PORTING: do you want to include Xutf8.h?" +#else #include "../Xutf8.h" diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c index 32619fe0a..13e515f10 100644 --- a/src/xutf8/utf8Wrap.c +++ b/src/xutf8/utf8Wrap.c @@ -23,7 +23,11 @@ /* * X11 UTF-8 text drawing functions. */ -#if !defined(WIN32) && !defined(__APPLE__) +#elif defined(WIN32) +#elif defined(__APPLE__) +#elif defined(FL_PORTING) +# pragma message "FL_PORTING: do you want to include Xutf8.h?" +#else #include "../Xutf8.h" #include <X11/Xlib.h> |