diff options
| author | Patrick Höhn <hoehnp@gmx.de> | 2018-10-04 14:29:48 +0200 |
|---|---|---|
| committer | Patrick Höhn <hoehnp@gmx.de> | 2018-10-04 14:41:59 +0200 |
| commit | d9b0dfb7011b816986186e33d167910eaa52ec6f (patch) | |
| tree | 136722034fdc04a097afe6bd7513df15d5847b38 | |
| parent | 51a517a902e6faae6734ef116bc6fba249f60c66 (diff) | |
| download | navit-d9b0dfb7011b816986186e33d167910eaa52ec6f.tar.gz | |
WIP fixing wince build
ändrad: navit/support/gettext_intl/dcigettext.c
ändrad: navit/support/gettext_intl/localealias.c
| -rw-r--r-- | navit/support/gettext_intl/dcigettext.c | 9 | ||||
| -rw-r--r-- | navit/support/gettext_intl/localealias.c | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/navit/support/gettext_intl/dcigettext.c b/navit/support/gettext_intl/dcigettext.c index 786c61b99..1b66fba37 100644 --- a/navit/support/gettext_intl/dcigettext.c +++ b/navit/support/gettext_intl/dcigettext.c @@ -133,13 +133,10 @@ extern int errno; # define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) #endif -#if defined __MINGW32__ +#if defined(__MINGW32__) && !defined(__MINGW32CE__) # define HAVE_MEMPCPY 1 #endif -#if defined __CEGCC__ -# warning Patrick found the problem. -#endif /* @@ end of prolog @@ */ @@ -166,7 +163,7 @@ char *getcwd (); # ifndef HAVE_STPCPY static char *stpcpy (char *dest, const char *src); # endif -# if !defined(HAVE_MEMPCPY) || defined(__CEGCC__) +# if !defined(HAVE_MEMPCPY) static void *mempcpy (void *dest, const void *src, size_t n); # endif #endif @@ -1183,7 +1180,7 @@ stpcpy (char *dest, const char *src) } #endif -#if !_LIBC && (!HAVE_MEMPCPY || defined(__CEGCC__)) +#if !_LIBC && !HAVE_MEMPCPY static void * mempcpy (void *dest, const void *src, size_t n) { diff --git a/navit/support/gettext_intl/localealias.c b/navit/support/gettext_intl/localealias.c index 7db068277..9078994d4 100644 --- a/navit/support/gettext_intl/localealias.c +++ b/navit/support/gettext_intl/localealias.c @@ -88,7 +88,7 @@ char *alloca (); __libc_lock_define_initialized (static, lock); #endif -#if defined __MINGW32__ && !defined __CEGCC__ +#if defined(__MINGW32__) && !defined(__MINGW32CE__) # define HAVE_MEMPCPY 1 #endif |