[PATCH 2/2] xfree86: include os.h for FatalError

Mark Kettenis mark.kettenis at xs4all.nl
Sat Jul 27 14:38:43 PDT 2013


> From: Julien Cristau <jcristau at debian.org>
> Date: Sat, 27 Jul 2013 21:08:29 +0200

The "os.h" header should probably be included even in if
HAS_SAVED_IDS_AND_SETEUID is defined, as in that case ErrorF gets
called, which also lives in "os.h".  Not sure why that doesn't cause
warnings on other systems.  Probably they pull in "os.h" as a
side-effect.  So perhaps you should just include it unconditionally
with the other Xserver headers.

Note that the fact that you're hitting this code on GNU/kFreeBSD is
almost certainly wrong.  No modern UNIX-line OS should hit that code.

> Signed-off-by: Julien Cristau <jcristau at debian.org>
> ---
>  hw/xfree86/parser/write.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
> index 9c706a0..b525b11 100644
> --- a/hw/xfree86/parser/write.c
> +++ b/hw/xfree86/parser/write.c
> @@ -67,6 +67,8 @@
>  
>  #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
>  #define HAS_SAVED_IDS_AND_SETEUID
> +#else
> +#include "os.h"
>  #endif
>  #if defined(WIN32)
>  #define HAS_NO_UIDS
> -- 
> 1.7.10.4
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 


More information about the xorg-devel mailing list