diff options
| author | Christopher Faylor <me@cgf.cx> | 2013-01-21 04:34:52 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2013-01-21 04:34:52 +0000 |
| commit | 6e75c72b89496ef702133a9b093f5bdadb5ca0e7 (patch) | |
| tree | 7b7ed1227affa28e3e0a3e4c83387eeab9819c66 /winsup/cygwin/miscfuncs.h | |
| parent | d89e61f354d50020fd4cb1fbfb37bf0864ad5ec1 (diff) | |
| download | cygnal-6e75c72b89496ef702133a9b093f5bdadb5ca0e7.tar.gz cygnal-6e75c72b89496ef702133a9b093f5bdadb5ca0e7.tar.bz2 cygnal-6e75c72b89496ef702133a9b093f5bdadb5ca0e7.zip | |
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.
Diffstat (limited to 'winsup/cygwin/miscfuncs.h')
| -rw-r--r-- | winsup/cygwin/miscfuncs.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/winsup/cygwin/miscfuncs.h b/winsup/cygwin/miscfuncs.h index 7995475d8..bc36a1987 100644 --- a/winsup/cygwin/miscfuncs.h +++ b/winsup/cygwin/miscfuncs.h @@ -11,11 +11,10 @@ details. */ #ifndef _MISCFUNCS_H #define _MISCFUNCS_H -int winprio_to_nice (DWORD) __attribute__ ((regparm (1))); -DWORD nice_to_winprio (int &) __attribute__ ((regparm (1))); +int __reg1 winprio_to_nice (DWORD); +DWORD __reg1 nice_to_winprio (int &); -bool __stdcall create_pipe (PHANDLE, PHANDLE, LPSECURITY_ATTRIBUTES, DWORD) - __attribute__ ((regparm (3))); +bool __reg3 create_pipe (PHANDLE, PHANDLE, LPSECURITY_ATTRIBUTES, DWORD); BOOL WINAPI CreatePipeOverlapped (PHANDLE read_handle, PHANDLE write_handle, LPSECURITY_ATTRIBUTES sa); @@ -27,7 +26,7 @@ BOOL WINAPI WritePipeOverlapped (HANDLE h, LPCVOID buf, DWORD len, extern "C" void yield (); #define import_address(x) __import_address ((void *)(x)) -void * __stdcall __attribute__ ((regparm (1))) __import_address (void *); +void * __reg1 __import_address (void *); void backslashify (const char *, char *, bool); void slashify (const char *, char *, bool); @@ -42,9 +41,9 @@ transform_chars (PUNICODE_STRING upath, USHORT start_idx) } /* Memory checking */ -int __stdcall check_invalid_virtual_addr (const void *s, unsigned sz) __attribute__ ((regparm(2))); +int __reg2 check_invalid_virtual_addr (const void *s, unsigned sz); -ssize_t check_iovec (const struct iovec *, int, bool) __attribute__ ((regparm(3))); +ssize_t __reg3 check_iovec (const struct iovec *, int, bool); #define check_iovec_for_read(a, b) check_iovec ((a), (b), false) #define check_iovec_for_write(a, b) check_iovec ((a), (b), true) |