diff options
| author | Matthew Waters <matthew@centricular.com> | 2014-11-28 13:04:21 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2014-11-28 13:04:21 +1100 |
| commit | e653ae9fc26ef98d625c0204ace36cf15e9f2f5c (patch) | |
| tree | 5d2d08728d8a3d710eb925e2da6a334c19c010ce | |
| parent | b0faa2dd77fcb6844e5244d0d4527e26d4118ec8 (diff) | |
| download | gstreamer-plugins-bad-e653ae9fc26ef98d625c0204ace36cf15e9f2f5c.tar.gz | |
gl: fixup compat definition for GLuint64 for OS X
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | gst-libs/gst/gl/glprototypes/gstgl_compat.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b4d45bd30..26de8578e 100644 --- a/configure.ac +++ b/configure.ac @@ -1272,6 +1272,7 @@ GST_GL_HAVE_GLCHAR=0 GST_GL_HAVE_GLSIZEIPTR=0 GST_GL_HAVE_GLINTPTR=0 GST_GL_HAVE_GLSYNC=0 +GST_GL_HAVE_GLUINT64=0 old_CFLAGS=$CFLAGS CFLAGS="$GL_CFLAGS $CFLAGS" @@ -1301,6 +1302,11 @@ if test "x$ac_cv_type_GLsync" = "xyes"; then GST_GL_HAVE_GLSYNC=1 fi +AC_CHECK_TYPES(GLuint64, [], [], [[$GL_INCLUDES]]) +if test "x$ac_cv_type_GLuint64" = "xyes"; then + GST_GL_HAVE_GLUINT64=1 +fi + CFLAGS=$old_CFLAGS GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES @@ -1309,6 +1315,7 @@ GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES #define GST_GL_HAVE_GLSIZEIPTR $GST_GL_HAVE_GLSIZEIPTR #define GST_GL_HAVE_GLINTPTR $GST_GL_HAVE_GLINTPTR #define GST_GL_HAVE_GLSYNC $GST_GL_HAVE_GLSYNC +#define GST_GL_HAVE_GLUINT64 $GST_GL_HAVE_GLUINT64 " AC_CONFIG_COMMANDS([gst-libs/gst/gl/gstglconfig.h], [ diff --git a/gst-libs/gst/gl/glprototypes/gstgl_compat.h b/gst-libs/gst/gl/glprototypes/gstgl_compat.h index 00d6944a6..a4f963d8d 100644 --- a/gst-libs/gst/gl/glprototypes/gstgl_compat.h +++ b/gst-libs/gst/gl/glprototypes/gstgl_compat.h @@ -39,7 +39,7 @@ typedef ptrdiff_t GLintptr; #if !GST_GL_HAVE_GLSYNC typedef gpointer GLsync; #endif -#ifndef GLuint64 +#if !GST_GL_HAVE_GLUINT64 typedef guint64 GLuint64; #endif |