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.

1 files changed, 4 insertions, 4 deletions

diff --git a/winsup/cygwin/winf.h b/winsup/cygwin/winf.h
index 55bedacb7..493350303 100644
--- a/winsup/cygwin/winf.h
+++ b/winsup/cygwin/winf.h
@@ -1,6 +1,6 @@
 /* winf.h
 
-   Copyright 2006, 2007, 2011 Red Hat, Inc.
+   Copyright 2006, 2007, 2009, 2011, 2013 Red Hat, Inc.
 
 This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
@@ -78,11 +78,11 @@ class linebuf
   size_t alloced;
   linebuf () : ix (0), buf (NULL), alloced (0) {}
   ~linebuf () {if (buf) free (buf);}
-  void add (const char *, int) __attribute__ ((regparm (3)));
+  void __reg3 add (const char *, int);
   void add (const char *what) {add (what, strlen (what));}
   void prepend (const char *, int);
-  void finish (bool) __attribute__ ((regparm (2)));
-  bool fromargv(av&, const char *, bool) __attribute__ ((regparm (3)));;
+  void __reg2 finish (bool);
+  bool __reg3 fromargv(av&, const char *, bool);;
   operator char *() {return buf;}
 };