diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-05-22 14:25:45 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-05-22 14:25:45 +0400 |
| commit | ece6c8e3835be50c0d4807d6a4ab95135070e714 (patch) | |
| tree | aaa5aacbcbac4c7381e2f53530870ce6b72e5478 /winsup | |
| parent | 81f9ce0734bdadbf60006b5d228a16ab0c054055 (diff) | |
* gmon.h: Pull in profile.h. Explain why.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/gmon.h | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index c63871cfd..98ec62506 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 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 referencing NULL pointer. 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 <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> |