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,6 @@
|
||||
/* cygmalloc.h: cygwin DLL malloc stuff
|
||||
|
||||
Copyright 2002, 2003, 2004, 2005, 2007 Red Hat, Inc.
|
||||
Copyright 2002, 2003, 2004, 2005, 2007, 2013 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@ -11,15 +11,24 @@ details. */
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
void dlfree (void *p) __attribute__ ((regparm (1)));
|
||||
void *dlmalloc (unsigned size) __attribute__ ((regparm (1)));
|
||||
void *dlrealloc (void *p, unsigned size) __attribute__ ((regparm (2)));
|
||||
void *dlcalloc (size_t nmemb, size_t size) __attribute__ ((regparm (2)));
|
||||
void *dlmemalign (size_t alignment, size_t bytes) __attribute__ ((regparm (2)));
|
||||
void *dlvalloc (size_t bytes) __attribute__ ((regparm (1)));
|
||||
size_t dlmalloc_usable_size (void *p) __attribute__ ((regparm (1)));
|
||||
int dlmalloc_trim (size_t) __attribute__ ((regparm (1)));
|
||||
int dlmallopt (int p, int v) __attribute__ ((regparm (2)));
|
||||
#ifndef __reg1
|
||||
# define __reg1 __stdcall __attribute__ ((regparm (1)))
|
||||
#endif
|
||||
#ifndef __reg2
|
||||
# define __reg2 __stdcall __attribute__ ((regparm (2)))
|
||||
#endif
|
||||
#ifndef __reg2
|
||||
# define __reg2 __stdcall __attribute__ ((regparm (2)))
|
||||
#endif
|
||||
void __reg1 dlfree (void *p);
|
||||
void __reg1 *dlmalloc (unsigned size);
|
||||
void __reg2 *dlrealloc (void *p, unsigned size);
|
||||
void __reg2 *dlcalloc (size_t nmemb, size_t size);
|
||||
void __reg2 *dlmemalign (size_t alignment, size_t bytes);
|
||||
void __reg1 *dlvalloc (size_t bytes);
|
||||
size_t __reg1 dlmalloc_usable_size (void *p);
|
||||
int __reg1 dlmalloc_trim (size_t);
|
||||
int __reg2 dlmallopt (int p, int v);
|
||||
void dlmalloc_stats ();
|
||||
|
||||
#ifndef __INSIDE_CYGWIN__
|
||||
|
Reference in New Issue
Block a user