aboutsummaryrefslogtreecommitdiff
path: root/winsup/cygwin/cygheap.h
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2013-01-21 04:34:52 +0000
committerChristopher Faylor <me@cgf.cx>2013-01-21 04:34:52 +0000
commit6e75c72b89496ef702133a9b093f5bdadb5ca0e7 (patch)
tree7b7ed1227affa28e3e0a3e4c83387eeab9819c66 /winsup/cygwin/cygheap.h
parentd89e61f354d50020fd4cb1fbfb37bf0864ad5ec1 (diff)
downloadnewlib-6e75c72b89496ef702133a9b093f5bdadb5ca0e7.zip
newlib-6e75c72b89496ef702133a9b093f5bdadb5ca0e7.tar.gz
newlib-6e75c72b89496ef702133a9b093f5bdadb5ca0e7.tar.bz2
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/cygheap.h')
-rw-r--r--winsup/cygwin/cygheap.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h
index e03774f..4cade6a 100644
--- a/winsup/cygwin/cygheap.h
+++ b/winsup/cygwin/cygheap.h
@@ -1,7 +1,7 @@
/* cygheap.h: Cygwin heap manager.
- Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
- 2010, 2011, 2012 Red Hat, Inc.
+ Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ 2011, 2012, 2013 Red Hat, Inc.
This file is part of Cygwin.
@@ -198,8 +198,7 @@ public:
return effec_cygsid.string (buf);
}
- const char *test_uid (char *&, const char *, size_t)
- __attribute__ ((regparm (3)));
+ const char __reg3 *test_uid (char *&, const char *, size_t);
};
/* cwd cache stuff. */
@@ -396,10 +395,10 @@ struct init_cygheap: public mini_cygheap
hook_chain hooks;
void close_ctty ();
void init_installation_root ();
- void init_tls_list () __attribute__ ((regparm (1)));;
- void add_tls (_cygtls *) __attribute__ ((regparm (2)));
- void remove_tls (_cygtls *, DWORD) __attribute__ ((regparm (3)));
- _cygtls *find_tls (int) __attribute__ ((regparm (2)));
+ void __reg1 init_tls_list ();;
+ void __reg2 add_tls (_cygtls *);
+ void __reg3 remove_tls (_cygtls *, DWORD);
+ _cygtls __reg2 *find_tls (int);
};