[PATCH] xproto: X11/Xos.h: removed stray #else (fixes build failure of libXau)
Alan Coopersmith
Alan.Coopersmith at Sun.COM
Sun Jun 14 08:35:23 PDT 2009
Sergei Trofimovich wrote:
> -#else
Yes, but after tracing back through ajax's commits, it seems a few
more lines should go away too. This is what I'm testing now and
will push if it works:
commit 3861202eedfc2048e386accf94ec81085c28dc51
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Sun Jun 14 08:31:13 2009 -0700
Removing dangling #else block from X_NOT_STDC_ENV removal
Fixes mass damage caused by ced38e880b54f2aae31a5354aecb4235a129f0a4
moving the includes for unistd.h, fcntl.h, etc. from the else for
X_NOT_STDC_ENV into the #else for #ifndef _XOS_H_, which made them
go away for everyone.
Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
diff --git a/Xos.h b/Xos.h
index 74bf102..b78755d 100644
--- a/Xos.h
+++ b/Xos.h
@@ -78,19 +78,6 @@ in this Software without prior written authorization from The
#endif
#endif
-#else
-
-#ifdef SYSV
-#include <string.h>
-#define index strchr
-#define rindex strrchr
-#else
-#include <strings.h>
-#define strchr index
-#define strrchr rindex
-#endif
-
-
/*
* Get open(2) constants
*/
--
-Alan Coopersmith- alan.coopersmith at sun.com
Sun Microsystems, Inc. - X Window System Engineering
More information about the xorg-devel
mailing list