1 files changed, 19 insertions, 10 deletions
diff --git a/winsup/cygwin/cygmalloc.h b/winsup/cygwin/cygmalloc.h
index 5c2a29a3b..1a0235d3a 100644
--- a/winsup/cygwin/cygmalloc.h
+++ b/winsup/cygwin/cygmalloc.h
@@ -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__