From ece6c8e3835be50c0d4807d6a4ab95135070e714 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 22 May 2014 10:25:45 +0000 Subject: [PATCH] * gmon.h: Pull in profile.h. Explain why. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/gmon.h | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index c63871cfd..98ec62506 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2014-05-22 Corinna Vinschen + + * gmon.h: Pull in profile.h. Explain why. + 2014-05-22 Corinna Vinschen * uinfo.cc (pwdgrp::fetch_account_from_windows): Fix potential SEGV diff --git a/winsup/cygwin/gmon.h b/winsup/cygwin/gmon.h index 919a1f21c..0932ed94c 100644 --- 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 +#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> -- 2.43.5