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,7 +1,7 @@
|
||||
/* sync.h: Header file for cygwin synchronization primitives.
|
||||
|
||||
Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2011, 2012,
|
||||
2013 Red Hat, Inc.
|
||||
Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010, 2011,
|
||||
2012, 2013 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@ -27,17 +27,17 @@ public:
|
||||
// class muto *next;
|
||||
|
||||
/* The real constructor. */
|
||||
muto *init (const char *) __attribute__ ((regparm (2)));
|
||||
muto __reg2 *init (const char *);
|
||||
|
||||
#if 0 /* FIXME: See comment in sync.cc */
|
||||
~muto ()
|
||||
#endif
|
||||
int acquire (DWORD ms = INFINITE) __attribute__ ((regparm (2))); /* Acquire the lock. */
|
||||
int release (_cygtls * = &_my_tls) __attribute__ ((regparm (2))); /* Release the lock. */
|
||||
int __reg2 acquire (DWORD ms = INFINITE); /* Acquire the lock. */
|
||||
int __reg2 release (_cygtls * = &_my_tls); /* Release the lock. */
|
||||
|
||||
bool acquired () __attribute__ ((regparm (1)));
|
||||
bool __reg1 acquired ();
|
||||
void upforgrabs () {tls = this;} // just set to an invalid address
|
||||
void grab () __attribute__ ((regparm (1)));
|
||||
void __reg1 grab ();
|
||||
operator int () const {return !!name;}
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user