Throughout, change __attribute__ ((regparm (N))) to just __regN. Throughout,
(mainly in fhandler*) start fixing gcc 4.7.2 mismatch between regparm definitions and declarations. * gendef: Define some functions to take @ declaration to accommodate _regN defines which use __stdcall. * gentls_offsets: Define __regN macros as empty. * autoload.cc (wsock_init): Remove unneeded regparm attribute. * winsup.h (__reg1): Define. (__reg2): Define. (__reg3): Define. * advapi32.cc (DuplicateTokenEx): Coerce some initializers to avoid warnings from gcc 4.7.2. * exceptions.cc (status_info): Declare struct to use NTSTATUS. (cygwin_exception::dump_exception): Coerce e->ExceptionCode to NTSTATUS. * fhandler_clipboard.cc (cygnativeformat): Redefine as UINT to avoid gcc 4.7.2 warnings. (fhandler_dev_clipboard::read): Ditto.
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
/* wchar.h: Extra wchar defs
|
||||
|
||||
Copyright 2007, 2009, 2010 Red Hat, Inc.
|
||||
Copyright 2007, 2009, 2010, 2013 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@ -50,25 +50,19 @@ extern char *__locale_charset ();
|
||||
|
||||
#ifdef __INSIDE_CYGWIN__
|
||||
#ifdef __cplusplus
|
||||
size_t __stdcall sys_cp_wcstombs (wctomb_p, const char *, char *, size_t,
|
||||
const wchar_t *, size_t = (size_t) -1)
|
||||
__attribute__ ((regparm(3)));
|
||||
size_t __stdcall sys_wcstombs (char *dst, size_t len, const wchar_t * src,
|
||||
size_t nwc = (size_t) -1)
|
||||
__attribute__ ((regparm(3)));
|
||||
size_t __stdcall sys_wcstombs_alloc (char **, int, const wchar_t *,
|
||||
size_t = (size_t) -1)
|
||||
__attribute__ ((regparm(3)));
|
||||
size_t __reg3 sys_cp_wcstombs (wctomb_p, const char *, char *, size_t,
|
||||
const wchar_t *, size_t = (size_t) -1);
|
||||
size_t __reg3 sys_wcstombs (char *dst, size_t len, const wchar_t * src,
|
||||
size_t nwc = (size_t) -1);
|
||||
size_t __reg3 sys_wcstombs_alloc (char **, int, const wchar_t *,
|
||||
size_t = (size_t) -1);
|
||||
|
||||
size_t __stdcall sys_cp_mbstowcs (mbtowc_p, const char *, wchar_t *, size_t,
|
||||
const char *, size_t = (size_t) -1)
|
||||
__attribute__ ((regparm(3)));
|
||||
size_t __stdcall sys_mbstowcs (wchar_t * dst, size_t dlen, const char *src,
|
||||
size_t nms = (size_t) -1)
|
||||
__attribute__ ((regparm(3)));
|
||||
size_t __stdcall sys_mbstowcs_alloc (wchar_t **, int, const char *,
|
||||
size_t = (size_t) -1)
|
||||
__attribute__ ((regparm(3)));
|
||||
size_t __reg3 sys_cp_mbstowcs (mbtowc_p, const char *, wchar_t *, size_t,
|
||||
const char *, size_t = (size_t) -1);
|
||||
size_t __reg3 sys_mbstowcs (wchar_t * dst, size_t dlen, const char *src,
|
||||
size_t nms = (size_t) -1);
|
||||
size_t __reg3 sys_mbstowcs_alloc (wchar_t **, int, const char *,
|
||||
size_t = (size_t) -1);
|
||||
#endif /* __cplusplus */
|
||||
#endif /* __INSIDE_CYGWIN__ */
|
||||
|
||||
|
Reference in New Issue
Block a user