* gmon.h: Pull in profile.h. Explain why.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c63871cfd5069c45366997e94cf6cff2712295e7..98ec62506a41374b16fd375011cfb8162c11a654 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-22  Corinna Vinschen  <corinna@vinschen.de>
+
+       * gmon.h: Pull in profile.h.  Explain why.
+
 2014-05-22  Corinna Vinschen  <corinna@vinschen.de>
 
        * uinfo.cc (pwdgrp::fetch_account_from_windows): Fix potential SEGV

diff --git a/winsup/cygwin/gmon.h b/winsup/cygwin/gmon.h
index 919a1f21c91fd389685dba636fa9a49e8b95edf9..0932ed94ca1a3559b93fd8689018b2ffcc961a35 100644 (file)
--- a/winsup/cygwin/gmon.h
+++ b/winsup/cygwin/gmon.h
@@ -44,7 +44,23 @@
 #define __P(x) x
 #endif
 
+/* On POSIX systems, profile.h is a KRB5 header.  To avoid collisions, just
+   pull in profile.h's content here.  The profile.h header won't be provided
+   by Mingw-w64 anymore at one point. */
+#if 0
 #include <profile.h>
+#else
+#ifndef _WIN64
+#define _MCOUNT_CALL __attribute__ ((regparm (2)))
+extern void _mcount(void);
+#else
+#define _MCOUNT_CALL
+extern void mcount(void);
+#endif
+#define _MCOUNT_DECL __attribute__((gnu_inline)) __inline__ \
+   void _MCOUNT_CALL _mcount_private
+#define MCOUNT
+#endif
 
 #ifdef __MINGW32__
 #include <_bsd_types.h>