Attachment 2007 Details for Bug 2577 – Patch to Xos_r.h to detect error properly and use correct version on Solaris

[patch] Patch to Xos_r.h to detect error properly and use correct version on Solaris

getpwnam_r.diff (text/plain), 1.43 KB, created by Alan Coopersmith on 2005-03-02 11:22:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Coopersmith

Created: 2005-03-02 11:22:06 UTC

Size: 1.43 KB

patch

obsolete

>--- xc/include/Xos_r.h.orig	Fri Apr 23 11:43:05 2004
>+++ xc/include/Xos_r.h	Wed Mar  2 11:13:33 2005
>@@ -1,4 +1,5 @@
> /* $Xorg: Xos_r.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
>+/* $XdotOrg: $ */
> /*
> Copyright 1996, 1998  The Open Group
> 
>@@ -190,10 +191,12 @@
> #endif /* !defined WIN32 */
> 
> /*
>- * Solaris 2.5 has SVR4 thread-safe API, but defines the POSIX
>- * thread-safe feature test macro.  Fix the feature test macro.
>+ * Solaris defines the POSIX thread-safe feature test macro, but
>+ * uses the older SVR4 thread-safe functions unless the POSIX ones
>+ * are specifically requested.  Fix the feature test macro.
>  */
>-#if defined(sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
>+#if defined(sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && \
>+	(_POSIX_C_SOURCE - 0 < 199506L) && !defined(_POSIX_PTHREAD_SEMANTICS)
> # undef _POSIX_THREAD_SAFE_FUNCTIONS
> #endif
> 
>@@ -368,11 +371,11 @@
> } _Xgetpwparams;
> typedef int _Xgetpwret;
> # define _XGetpwuid(u,p) \
>-((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == -1) ? \
>- NULL : (p).pwp)
>+((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == 0) ? \
>+ (p).pwp : NULL)
> # define _XGetpwnam(u,p) \
>-((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == -1) ? \
>- NULL : (p).pwp)
>+((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == 0) ? \
>+ (p).pwp : NULL)
> #endif /* X_INCLUDE_PWD_H */
> 
> #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)

Actions: View | Splinter Review

Attachments on bug 2577: 1941 | 1942 | 1944 | 2007 | 5032 | 5033

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.