geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson,configure: always define HAVE_OPEN_MEMSTREAM 

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
main
Eric Engestrom 2018-01-26 17:04:28 +00:00
parent 32e0370e36
commit 1a44bbae73
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -189,7 +189,9 @@ AC_CHECK_FUNCS([clock_gettime], [CLOCK_LIB=],
[AC_MSG_ERROR([Couldn't find clock_gettime])])]) [AC_MSG_ERROR([Couldn't find clock_gettime])])])
AC_SUBST([CLOCK_LIB]) AC_SUBST([CLOCK_LIB])
AC_CHECK_FUNCS([open_memstream], [HAVE_OPEN_MEMSTREAM=yes]) AC_CHECK_FUNCS([open_memstream],
[AC_DEFINE([HAVE_OPEN_MEMSTREAM], 1, [Have open_memstream()])],
[AC_DEFINE([HAVE_OPEN_MEMSTREAM], 0)])
dnl Use lots of warning flags with with gcc and compatible compilers dnl Use lots of warning flags with with gcc and compatible compilers

4
intel/test_decode.c
View File

@ -91,7 +91,7 @@ compare_batch(struct drm_intel_decode *ctx, const char *batch_filename)
{ {
FILE *out = NULL; FILE *out = NULL;
void *ptr, *ref_ptr, *batch_ptr; void *ptr, *ref_ptr, *batch_ptr;
#ifdef HAVE_OPEN_MEMSTREAM #if HAVE_OPEN_MEMSTREAM
size_t size; size_t size;
#endif #endif
size_t ref_size, batch_size; size_t ref_size, batch_size;
@ -109,7 +109,7 @@ compare_batch(struct drm_intel_decode *ctx, const char *batch_filename)
* figure out how to output to a file in a safe and sane way * figure out how to output to a file in a safe and sane way
* inside of an automake project's test infrastructure. * inside of an automake project's test infrastructure.
*/ */
#ifdef HAVE_OPEN_MEMSTREAM #if HAVE_OPEN_MEMSTREAM
out = open_memstream((char **)&ptr, &size); out = open_memstream((char **)&ptr, &size);
#else #else
fprintf(stderr, "platform lacks open_memstream, skipping.\n"); fprintf(stderr, "platform lacks open_memstream, skipping.\n");

4
meson.build
View File

@ -196,9 +196,7 @@ if cc.has_header_symbol('sys/sysmacros.h', 'major')
elif cc.has_header_symbol('sys/mkdev.h', 'major') elif cc.has_header_symbol('sys/mkdev.h', 'major')
config.set10('MAJOR_IN_MKDEV', true) config.set10('MAJOR_IN_MKDEV', true)
endif endif
if cc.has_function('open_memstream') config.set10('HAVE_OPEN_MEMSTREAM', cc.has_function('open_memstream'))
config.set10('HAVE_OPEN_MEMSTREAM', true)
endif
warn_c_args = [] warn_c_args = []
foreach a : ['-Wall', '-Wextra', '-Wsign-compare', '-Werror=undef', foreach a : ['-Wall', '-Wextra', '-Wsign-compare', '-Werror=undef',