From bd094739f3fc2934dc2bc9d6ab3a93bffa560a7b Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 18 Aug 2014 18:24:06 +0000 Subject: [PATCH] * miscfuncs.cc (strlwr): Rename from cygwin_strlwr. Drop __stdcall decoration. (strupr): Rename from cygwin_strupr. Drop __stdcall decoration. * string.h (strlwr): Remove override macro. Simply declare. (strupr): Ditto. --- winsup/cygwin/ChangeLog | 8 ++++++++ winsup/cygwin/miscfuncs.cc | 8 ++++---- winsup/cygwin/string.h | 9 ++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6c52cf781..34016b09e 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2014-08-18 Corinna Vinschen + + * miscfuncs.cc (strlwr): Rename from cygwin_strlwr. Drop __stdcall + decoration. + (strupr): Rename from cygwin_strupr. Drop __stdcall decoration. + * string.h (strlwr): Remove override macro. Simply declare. + (strupr): Ditto. + 2014-08-18 Corinna Vinschen * dtable.cc (dtable::init_std_file_from_handle): Mention that console diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc index 7397bea47..1ec92d9dc 100644 --- a/winsup/cygwin/miscfuncs.cc +++ b/winsup/cygwin/miscfuncs.cc @@ -146,8 +146,8 @@ cygwin_strncasecmp (const char *cs, const char *ct, size_t n) return RtlCompareUnicodeString (&us, &ut, TRUE); } -extern "C" char * __stdcall -cygwin_strlwr (char *string) +extern "C" char * +strlwr (char *string) { UNICODE_STRING us; size_t len = (strlen (string) + 1) * sizeof (WCHAR); @@ -160,8 +160,8 @@ cygwin_strlwr (char *string) return string; } -extern "C" char * __stdcall -cygwin_strupr (char *string) +extern "C" char * +strupr (char *string) { UNICODE_STRING us; size_t len = (strlen (string) + 1) * sizeof (WCHAR); diff --git a/winsup/cygwin/string.h b/winsup/cygwin/string.h index 0a42f60eb..3b8d564c4 100644 --- a/winsup/cygwin/string.h +++ b/winsup/cygwin/string.h @@ -79,13 +79,8 @@ int __stdcall cygwin_strncasecmp (const char *, const char *, size_t); #define strcasematch(s1,s2) (!cygwin_strcasecmp ((s1),(s2))) #define strncasematch(s1,s2,n) (!cygwin_strncasecmp ((s1),(s2),(n))) -#undef strlwr -#define strlwr cygwin_strlwr -char * __stdcall cygwin_strlwr (char *); - -#undef strupr -#define strupr cygwin_strupr -char * __stdcall cygwin_strupr (char *); +char *strlwr (char *); +char *strupr (char *); #endif /* __INSIDE_CYGWIN__ */