Xorg missing includes

[Pierre Willenbrock]

Ben Gamari schrieb:
> It seems like gcc 4.4 (in Karmic) must have become a little stricter recently.
> My xorg builds tonight have been having tons of issues with missing includes
> that were strangely skipped right over in the past. Anyways, I've added the
> necessary includes. xserver builds fine with these patches. Thanks,
> 
> - Ben

This is a problem in Xos.h, a #else was overlooked when removing an
#ifdef #endif pair, in commit ced38e880b54f2aae31a5354aecb4235a129f0a4:
Remove all trace of X_NOT_STDC_ENV (#6527).

diff --git a/Xos.h b/Xos.h
--- a/Xos.h
+++ b/Xos.h
@@ -81,8 +81,6 @@
 #endif
 #endif

-#else
-
 #ifdef SYSV
 #include <string.h>
 #define index strchr

This #else is now on the top-level.
Maybe the part between #else and the removed #endif should go away, too.

Regards,
  Pierre