Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

freeswitch-stable: fix incompatible pointer type

Browse source 
Currently compiles fail with:

  CC       libfreeswitch_la-switch_regex.lo
src/switch_regex.c: In function 'switch_regex_compile':
src/switch_regex.c:40:9: error: return from incompatible pointer type [-Werror=incompatible-pointer-types]
  return pcre_compile(pattern, options, errorptr, erroroffset, tables);
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Makefile:2100: recipe for target 'libfreeswitch_la-switch_regex.lo' failed
make[5]: *** [libfreeswitch_la-switch_regex.lo] Error 1

Fix cherry-picked from upstream.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2018-06-21 21:09:49 +02:00
parent 02928ab9c8
commit 2c490b7fd1
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/freeswitch-stable/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PRG_NAME:=freeswitch PRG_NAME:=freeswitch
PKG_NAME:=$(PRG_NAME)-stable PKG_NAME:=$(PRG_NAME)-stable
PKG_VERSION:=1.6.20 PKG_VERSION:=1.6.20
PKG_RELEASE:=7 PKG_RELEASE:=8
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz

11
net/freeswitch-stable/patches/350-fix-pcre-pointer-type.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/src/switch_regex.c
+++ b/src/switch_regex.c
@@ -37,7 +37,7 @@ SWITCH_DECLARE(switch_regex_t *) switch_
int options, const char **errorptr, int *erroroffset, const unsigned char *tables)
{
- return pcre_compile(pattern, options, errorptr, erroroffset, tables);
+ return (switch_regex_t *)pcre_compile(pattern, options, errorptr, erroroffset, tables);
}