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,6 +1,7 @@
|
||||
/* tty.h: shared tty info for cygwin
|
||||
|
||||
Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2009, 2010, 2011 Red Hat, Inc.
|
||||
Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2009, 2010, 2011, 2012, 2013
|
||||
Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@ -77,16 +78,15 @@ public:
|
||||
void setsid (pid_t tsid) {sid = tsid;}
|
||||
void kill_pgrp (int);
|
||||
int is_orphaned_process_group (int);
|
||||
const char *ttyname () __attribute ((regparm (1)));
|
||||
const __reg1 char *ttyname () __attribute (());
|
||||
};
|
||||
|
||||
class fhandler_pty_master;
|
||||
|
||||
class tty: public tty_min
|
||||
{
|
||||
HANDLE get_event (const char *fmt, PSECURITY_ATTRIBUTES sa,
|
||||
HANDLE __reg3 get_event (const char *fmt, PSECURITY_ATTRIBUTES sa,
|
||||
BOOL manual_reset = FALSE);
|
||||
__attribute__ ((regparm (3)));
|
||||
public:
|
||||
pid_t master_pid; /* PID of tty master process */
|
||||
|
||||
@ -124,7 +124,7 @@ public:
|
||||
int connect (int);
|
||||
void init ();
|
||||
tty_min *get_cttyp ();
|
||||
int __stdcall attach (int n) __attribute__ ((regparm (2)));
|
||||
int __reg2 attach (int n);
|
||||
static void __stdcall init_session ();
|
||||
friend class lock_ttys;
|
||||
};
|
||||
|
Reference in New Issue
Block a user