From 14e54d7c97e4b202bbd7eef189afa384887551c3 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Mon, 10 Feb 2003 21:13:34 +0000 Subject: * include/_mingw.h (_CRTIMP): Define for __GNUC__ if __declspec(dllimport) supported. (__cdecl): Define if not already defined. (__stdcall): Likewise. * include/dirent.h: Qualify fuctions with __cdecl. * include/fenv.h: Likewise. * include/inttypes.h: Likewise. * include/assert.h: Qualify fuctions with __cdecl. Qualify CRT dll imports with _CRTIMP. * include/conio.h: Likewise. * include/ctype.h: Likewise. * include/direct.h: Likewise. * include/dos.h: Likewise. * include/errno.h: Likewise. * include/float.h: Likewise. * include/io.h: Likewise. * include/locale.h: Likewise. * include/malloc.h: Likewise. * include/math.h: Likewise. * include/mbctype.h: Likewise. * include/mbstring.h: Likewise. * include/process.h: Likewise. * include/setjmp.h: Likewise. * include/signal.h: Likewise. * include/stdio.h: Likewise. * include/stdlib.h: Likewise. * include/string.h: Likewise. * include/time.h: Likewise. * include/wchar.h: Likewise. * include/wctype.h: Likewise. * include/sys/stat.h: Likewise. * include/sys/timeb.h: Likewise. * include/sys/utime.h: Likewise. * include/ctype.h: Guard ctype inlines with __NO_INLINE__. * include/wctype.h: Guard wctype inlines with __NO_INLINE__. * include/stdio.h (__VALIST): Guard against prior definition. --- winsup/mingw/include/locale.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'winsup/mingw/include/locale.h') diff --git a/winsup/mingw/include/locale.h b/winsup/mingw/include/locale.h index 16fb6119a..3f36388bd 100644 --- a/winsup/mingw/include/locale.h +++ b/winsup/mingw/include/locale.h @@ -84,13 +84,13 @@ struct lconv extern "C" { #endif -char* setlocale (int, const char*); -struct lconv* localeconv (void); +_CRTIMP char* __cdecl setlocale (int, const char*); +_CRTIMP struct lconv* __cdecl localeconv (void); #ifndef _WLOCALE_DEFINED /* also declared in wchar.h */ # define __need_wchar_t # include - wchar_t* _wsetlocale(int, const wchar_t*); + _CRTIMP wchar_t* __cdecl _wsetlocale(int, const wchar_t*); # define _WLOCALE_DEFINED #endif /* ndef _WLOCALE_DEFINED */ -- cgit v1.2.3