fdo-mirrors/xorg-xorgproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xorgproto.git synced 2026-05-07 04:58:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xproto: Move NARROWPROTO logic out of configure time

Browse source 
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2018-02-01 14:45:56 -05:00
parent 627f4f40ab
commit 05b1963945
2 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
configure.ac
View file

@ -65,10 +65,6 @@ AC_ARG_ENABLE(nested-prototypes,
AS_HELP_STRING([--enable-nested-prototypes],
[nested prototypes are supported (default: auto)]),
[NESTEDPROTO=$enableval], [NESTEDPROTO=auto])
AC_ARG_ENABLE(wide-prototypes,
AS_HELP_STRING([--enable-wide-prototypes],
[widen function prototypes (default: auto)]),
[WIDEPROTO=$enableval], [WIDEPROTO=auto])
AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h])
@ -219,22 +215,6 @@ else
fi
fi
AC_MSG_CHECKING([whether to widen function prototypes])
if test "x$WIDEPROTO" = xauto; then
case $host_os in
linux*) WIDEPROTO=no ;;
freebsd*) WIDEPROTO=no ;;
netbsd*) WIDEPROTO=no ;;
openbsd*) WIDEPROTO=no ;;
*) WIDEPROTO=yes ;;
esac
fi
AC_MSG_RESULT([$WIDEPROTO])
if test "x$WIDEPROTO" = xno; then
AC_DEFINE(NARROWPROTO, [], [Narrow prototypes])
fi
AC_CONFIG_FILES([applewmproto.pc
bigreqsproto.pc
compositeproto.pc

5
include/X11/Xfuncproto.h.in
View file

@ -48,8 +48,9 @@ in this Software without prior written authorization from The Open Group.
#endif /* _Xconst */
/* Function prototype configuration (see configure for more info) */
#ifndef NARROWPROTO
#undef NARROWPROTO
#if !defined(NARROWPROTO) && \
(defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
#define NARROWPROTO
#endif
#ifndef FUNCPROTO
#undef FUNCPROTO