marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Fix configure failures under -Werror -Wall.

oldstable
Dan Kegel 2011-08-31 17:35:49 -07:00 committed by Alexandre Julliard
parent 82954d45de
commit 45725be9d5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -8425,7 +8425,7 @@ fi
int int
main () main ()
{ {
static typeof(XRRSetScreenConfigAndRate) * func; static typeof(XRRSetScreenConfigAndRate) * func; if (func) return 0;
; ;
return 0; return 0;
} }
@ -8502,7 +8502,7 @@ fi
int int
main () main ()
{ {
static typeof(XineramaQueryScreens) * func; static typeof(XineramaQueryScreens) * func; if (func) return 0;
; ;
return 0; return 0;
} }
@ -8691,7 +8691,7 @@ else
int int
main () main ()
{ {
GLenum test = GL_UNSIGNED_SHORT_5_6_5; GLenum test = GL_UNSIGNED_SHORT_5_6_5; return (test == GL_UNSIGNED_SHORT_5_6_5);
; ;
return 0; return 0;
} }
@ -9520,7 +9520,7 @@ if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
int int
main () main ()
{ {
typeof(gnutls_mac_get_key_size) *pfunc; static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;
; ;
return 0; return 0;
} }
@ -10535,7 +10535,7 @@ $as_echo_n "checking whether gint64 defined by gst/app/gstappsink.h is indeed 64
int int
main () main ()
{ {
int a[sizeof(gint64) > 4 ? 1 : -1] static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;
; ;
return 0; return 0;
} }

10
configure.ac
View File

@ -1024,7 +1024,7 @@ then
if test "$ac_cv_header_X11_extensions_Xrandr_h" = "yes" -a "x$ac_cv_lib_soname_Xrender" != "x" if test "$ac_cv_header_X11_extensions_Xrandr_h" = "yes" -a "x$ac_cv_lib_soname_Xrender" != "x"
then then
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func;]])], #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func; if (func) return 0;]])],
[WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])]) [WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])])
fi fi
WINE_NOTICE_WITH(xrandr,[test "x$ac_cv_lib_soname_Xrandr" = "x"], WINE_NOTICE_WITH(xrandr,[test "x$ac_cv_lib_soname_Xrandr" = "x"],
@ -1034,7 +1034,7 @@ then
if test "$ac_cv_header_X11_extensions_Xinerama_h" = "yes" if test "$ac_cv_header_X11_extensions_Xinerama_h" = "yes"
then then
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
#include <X11/extensions/Xinerama.h>]], [[static typeof(XineramaQueryScreens) * func;]])], #include <X11/extensions/Xinerama.h>]], [[static typeof(XineramaQueryScreens) * func; if (func) return 0;]])],
[WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])]) [WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])])
fi fi
WINE_NOTICE_WITH(xinerama,[test "x$ac_cv_lib_soname_Xinerama" = "x"], WINE_NOTICE_WITH(xinerama,[test "x$ac_cv_lib_soname_Xinerama" = "x"],
@ -1068,7 +1068,7 @@ then
then then
dnl Check for some problems due to old Mesa versions dnl Check for some problems due to old Mesa versions
AC_CACHE_CHECK([for up-to-date OpenGL version], wine_cv_opengl_header_version_OK, AC_CACHE_CHECK([for up-to-date OpenGL version], wine_cv_opengl_header_version_OK,
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <GL/gl.h>]], [[GLenum test = GL_UNSIGNED_SHORT_5_6_5;]])], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <GL/gl.h>]], [[GLenum test = GL_UNSIGNED_SHORT_5_6_5; return (test == GL_UNSIGNED_SHORT_5_6_5);]])],
[wine_cv_opengl_header_version_OK="yes"], [wine_cv_opengl_header_version_OK="yes"],
[wine_cv_opengl_header_version_OK="no"])) [wine_cv_opengl_header_version_OK="no"]))
@ -1235,7 +1235,7 @@ then
CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
fi fi
AC_CHECK_HEADER(gnutls/gnutls.h, AC_CHECK_HEADER(gnutls/gnutls.h,
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_mac_get_key_size) *pfunc;]])], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
[WINE_CHECK_SONAME(gnutls,gnutls_global_init, [WINE_CHECK_SONAME(gnutls,gnutls_global_init,
[AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])]) [AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])])
CPPFLAGS="$ac_save_CPPFLAGS" CPPFLAGS="$ac_save_CPPFLAGS"
@ -1458,7 +1458,7 @@ then
[AC_CHECK_HEADER([gst/app/gstappsink.h], [AC_CHECK_HEADER([gst/app/gstappsink.h],
[AC_MSG_CHECKING([whether gint64 defined by gst/app/gstappsink.h is indeed 64-bit]) [AC_MSG_CHECKING([whether gint64 defined by gst/app/gstappsink.h is indeed 64-bit])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/app/gstappsink.h>]], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/app/gstappsink.h>]],
[[int a[sizeof(gint64) > 4 ? 1 : -1]]])], [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
AC_CHECK_LIB(gstreamer-0.10,gst_pad_get_caps_reffed, AC_CHECK_LIB(gstreamer-0.10,gst_pad_get_caps_reffed,
[AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new, [AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new,