Author: dnusinow
Date: 2005-08-05 11:48:09 -0500 (Fri, 05 Aug 2005)
New Revision: 502
Modified:
branches/6.9/debian/patches/general/008_fix_xgetpw_macro.diff
Log:
- Re-add missing part from general/008_fix_xgetpw_macro.diff. Not having
this caused FTBFS.
Modified: branches/6.9/debian/patches/general/008_fix_xgetpw_macro.diff
===================================================================
--- branches/6.9/debian/patches/general/008_fix_xgetpw_macro.diff
2005-08-05 09:44:56 UTC (rev 501)
+++ branches/6.9/debian/patches/general/008_fix_xgetpw_macro.diff
2005-08-05 16:48:09 UTC (rev 502)
@@ -4,8 +4,8 @@
Index: xc/include/Xos_r.h
===================================================================
---- xc/include/Xos_r.h.orig 2005-03-02 14:29:31.000000000 -0500
-+++ xc/include/Xos_r.h 2005-07-27 20:38:06.000000000 -0400
+--- xc/include/Xos_r.h.orig 2005-08-05 12:37:52.000000000 -0400
++++ xc/include/Xos_r.h 2005-08-05 12:40:17.000000000 -0400
@@ -220,8 +220,8 @@
*
* typedef ... _Xgetpwparams;
@@ -77,10 +77,23 @@
# endif /* SVR4 */
#else /* _POSIX_THREAD_SAFE_FUNCTIONS */
+@@ -370,10 +370,10 @@
+ struct passwd* pwp;
+ } _Xgetpwparams;
+ typedef int _Xgetpwret;
+-# define _XGetpwuid(u,p) \
++# define _XGetpwuid(u,p,s) \
+ ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == 0) ? \
+ (p).pwp : NULL)
+-# define _XGetpwnam(u,p) \
++# define _XGetpwnam(u,p,s) \
+ ((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == 0) ? \
+ (p).pwp : NULL)
+ #endif /* X_INCLUDE_PWD_H */
Index: xc/lib/X11/GetDflt.c
===================================================================
---- xc/lib/X11/GetDflt.c.orig 2005-05-13 18:53:43.000000000 -0400
-+++ xc/lib/X11/GetDflt.c 2005-07-27 20:38:06.000000000 -0400
+--- xc/lib/X11/GetDflt.c.orig 2005-08-05 12:37:52.000000000 -0400
++++ xc/lib/X11/GetDflt.c 2005-08-05 12:38:33.000000000 -0400
@@ -129,10 +129,11 @@
(void) strncpy(dest, ptr, len-1);
dest[len-1] = '\0';
@@ -97,8 +110,8 @@
dest[len-1] = '\0';
Index: xc/lib/Xp/XpJob.c
===================================================================
---- xc/lib/Xp/XpJob.c.orig 2005-05-18 16:27:58.000000000 -0400
-+++ xc/lib/Xp/XpJob.c 2005-07-27 20:38:06.000000000 -0400
+--- xc/lib/Xp/XpJob.c.orig 2005-08-05 12:37:52.000000000 -0400
++++ xc/lib/Xp/XpJob.c 2005-08-05 12:38:33.000000000 -0400
@@ -108,7 +108,8 @@
_Xgetpwparams pwparams;
#endif
@@ -111,8 +124,8 @@
#else
Index: xc/lib/Xt/Initialize.c
===================================================================
---- xc/lib/Xt/Initialize.c.orig 2005-05-18 11:38:31.000000000 -0400
-+++ xc/lib/Xt/Initialize.c 2005-07-27 20:38:06.000000000 -0400
+--- xc/lib/Xt/Initialize.c.orig 2005-08-05 12:37:52.000000000 -0400
++++ xc/lib/Xt/Initialize.c 2005-08-05 12:38:33.000000000 -0400
@@ -306,7 +306,8 @@
(void) strncpy (dest, ptr, len-1);
dest[len-1] = '\0';
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
