diff options
| author | Christopher Faylor <me@cgf.cx> | 2013-01-21 08:34:52 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2013-01-21 08:34:52 +0400 |
| commit | 6e75c72b89496ef702133a9b093f5bdadb5ca0e7 (patch) | |
| tree | 7b7ed1227affa28e3e0a3e4c83387eeab9819c66 /winsup/cygwin/environ.h | |
| parent | d89e61f354d50020fd4cb1fbfb37bf0864ad5ec1 (diff) | |
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/environ.h')
| -rw-r--r-- | winsup/cygwin/environ.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/winsup/cygwin/environ.h b/winsup/cygwin/environ.h index 78305a8b0..888c36625 100644 --- a/winsup/cygwin/environ.h +++ b/winsup/cygwin/environ.h @@ -1,6 +1,6 @@ /* environ.h: Declarations for environ manipulation - Copyright 2000, 2001, 2002, 2003, 2005, 2006, 2008 Red Hat, Inc. + Copyright 2000, 2001, 2002, 2003, 2005, 2006, 2008, 2013 Red Hat, Inc. This file is part of Cygwin. @@ -9,8 +9,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ /* Initialize the environment */ -void environ_init (char **, int) - __attribute__ ((regparm (2))); +void __reg2 environ_init (char **, int); /* The structure below is used to control conversion to/from posix-style file specs. Currently, only PATH and HOME are converted, but PATH @@ -25,8 +24,7 @@ struct win_env ssize_t (*toposix) (const void *, void *, size_t); ssize_t (*towin32) (const void *, void *, size_t); bool immediate; - void add_cache (const char *in_posix, const char *in_native = NULL) - __attribute__ ((regparm (3))); + void __reg3 add_cache (const char *in_posix, const char *in_native = NULL); const char * get_native () const {return native ? native + namelen : NULL;} const char * get_posix () const {return posix ? posix : NULL;} struct win_env& operator = (struct win_env& x); @@ -34,16 +32,13 @@ struct win_env ~win_env (); }; -win_env * __stdcall getwinenv (const char *name, const char *posix = NULL, win_env * = NULL) - __attribute__ ((regparm (3))); -char * __stdcall getwinenveq (const char *name, size_t len, int) - __attribute__ ((regparm (3))); +win_env * __reg3 getwinenv (const char *name, const char *posix = NULL, win_env * = NULL); +char * __reg3 getwinenveq (const char *name, size_t len, int); void __stdcall update_envptrs (); extern "C" char **__cygwin_environ, ***main_environ; extern "C" char __stdcall **cur_environ (); -char ** __stdcall build_env (const char * const *envp, PWCHAR &envblock, - int &envc, bool need_envblock) - __attribute__ ((regparm (3))); +char ** __reg3 build_env (const char * const *envp, PWCHAR &envblock, + int &envc, bool need_envblock); #define ENV_CVT -1 |