[Mesa-dev] [PATCH] loader: unconditionally include unistd.h and stdlib.h

Nicolai Hähnle nhaehnle at gmail.com
Fri Feb 10 09:51:35 UTC 2017


On 09.02.2017 23:10, Emil Velikov wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> Otherwise we would fail with "implicit declaration of function" geteuid
> and getenv respectively.
>
> To trigger (re)move the libdrm.pc file and use the following:
>
>  $ ./autogen.sh --disable-egl --disable-gbm --disable-dri \
>     --with-dri-drivers=swrast --with-gallium-drivers=swrast
>  $ make
>
> Cc: Vinson Lee <vlee at freedesktop.org>
> Cc: Nicolai Hähnle <nicolai.haehnle at amd.com>
> Fixes: 3f462050c ("loader: Add an environment variable to override driver name choice.
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99701
> v2: [Emil: handle stdlib.h add commit message]
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> Vinson, Nicolai, I've reproduced the issue and this patch should resolve
> it completely.

It seems weird to review my own patch. Looks good to me anyway, and 
thanks for figuring out a possible trigger :)

Nicolai

> ---
>  src/loader/loader.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/loader/loader.c b/src/loader/loader.c
> index 4825151ad5..3b28a0e7db 100644
> --- a/src/loader/loader.c
> +++ b/src/loader/loader.c
> @@ -33,6 +33,8 @@
>  #include <stdio.h>
>  #include <stdbool.h>
>  #include <string.h>
> +#include <unistd.h>
> +#include <stdlib.h>
>  #ifdef MAJOR_IN_MKDEV
>  #include <sys/mkdev.h>
>  #endif
> @@ -42,8 +44,6 @@
>  #include "loader.h"
>
>  #ifdef HAVE_LIBDRM
> -#include <stdlib.h>
> -#include <unistd.h>
>  #include <xf86drm.h>
>  #ifdef USE_DRICONF
>  #include "xmlconfig.h"
>



More information about the mesa-dev mailing list