MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-04 10:26:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix the compilation problem because of gperf changes in 3.1

Browse Source
This commit is contained in:
Gergan Penkov 2017-05-27 12:28:00 +02:00
parent 3fe3c71ea7
commit 08d25154e5
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.ac
View File

@ -32,6 +32,27 @@ to install it.]])],
[AC_MSG_ERROR([[GNU gperf required, please install it.]])]) [AC_MSG_ERROR([[GNU gperf required, please install it.]])])
]) ])
GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)"
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([
#include <string.h>
const char * in_word_set(const char *, size_t);
$GPERF_TEST]
)],
[GPERF_LEN_TYPE=size_t],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([
#include <string.h>
const char * in_word_set(const char *, unsigned);
$GPERF_TEST]
)],
[GPERF_LEN_TYPE=unsigned],
[AC_MSG_ERROR([** unable to determine gperf len type])]
)]
)
AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type])
AC_PATH_PROG([ANTLR], [[antlr3]]) AC_PATH_PROG([ANTLR], [[antlr3]])
AS_IF([[test -z "$ANTLR"]], AS_IF([[test -z "$ANTLR"]],
[AS_IF([[test -f "$srcdir/src/SMARTPLLexer.h"]], [AS_IF([[test -f "$srcdir/src/SMARTPLLexer.h"]],

3
src/dmap_common.h
View File

@ -2,6 +2,7 @@
#ifndef __DMAP_HELPERS_H__ #ifndef __DMAP_HELPERS_H__
#define __DMAP_HELPERS_H__ #define __DMAP_HELPERS_H__
#include "config.h"
#include <event2/buffer.h> #include <event2/buffer.h>
#include <event2/http.h> #include <event2/http.h>
@ -46,7 +47,7 @@ dmap_get_fields_table(int *nfields);
/* From dmap_fields.gperf - keep in sync, don't alter */ /* From dmap_fields.gperf - keep in sync, don't alter */
const struct dmap_field * const struct dmap_field *
dmap_find_field (register const char *str, register unsigned int len); dmap_find_field (register const char *str, register GPERF_LEN_TYPE len);
void void