kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Solaris compatibility issues (bug #4339)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-05-20 03:18:35 +00:00
parent 17e476378a
commit 77284bfaa6
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -512,7 +512,7 @@ update:
if [ -f patches/.applied ]; then \ if [ -f patches/.applied ]; then \
patches=`cat patches/.applied`; \ patches=`cat patches/.applied`; \
fi; \ fi; \
if ! [ -z "$$patches" ]; then \ if [ ! -z "$$patches" ]; then \
for x in $$patches; do \ for x in $$patches; do \
echo "Unapplying $$x..."; \ echo "Unapplying $$x..."; \
patch -R -p0 < patches/$$x; \ patch -R -p0 < patches/$$x; \
@@ -527,7 +527,7 @@ update:
grep ^C update.out | cut -d' ' -f2- ; \ grep ^C update.out | cut -d' ' -f2- ; \
fi ; \ fi ; \
rm -f update.out; \ rm -f update.out; \
if ! [ -z "$$patches" ]; then \ if [ ! -z "$$patches" ]; then \
for x in $$patches; do \ for x in $$patches; do \
if [ -f patches/$$x ]; then \ if [ -f patches/$$x ]; then \
echo "Applying patch $$x..."; \ echo "Applying patch $$x..."; \
@@ -638,7 +638,7 @@ upgrade: all bininstall
adsi: all adsi: all
mkdir -p $(DESTDIR)$(ASTETCDIR) mkdir -p $(DESTDIR)$(ASTETCDIR)
for x in configs/*.adsi; do \ for x in configs/*.adsi; do \
if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
fi ; \ fi ; \
done done
@@ -806,7 +806,7 @@ env:
# We can avoid this by making noclean # We can avoid this by making noclean
cleantest: cleantest:
if ! cmp -s .cleancount .lastclean ; then \ if cmp -s .cleancount .lastclean ; then echo ; else \
$(MAKE) clean; cp -f .cleancount .lastclean;\ $(MAKE) clean; cp -f .cleancount .lastclean;\
fi fi
@@ -840,7 +840,7 @@ apply:
unapply: unapply:
@if [ -z "$(PATCH)" ]; then \ @if [ -z "$(PATCH)" ]; then \
echo "Usage: make PATCH=<patchname> unapply"; \ echo "Usage: make PATCH=<patchname> unapply"; \
elif ! grep -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \ elif grep -v -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \
echo "Patch $(PATCH) is not applied"; \ echo "Patch $(PATCH) is not applied"; \
elif [ -f "patches/$(PATCH)" ]; then \ elif [ -f "patches/$(PATCH)" ]; then \
echo "Un-applying patch $(PATCH)"; \ echo "Un-applying patch $(PATCH)"; \

4
ast_expr2.fl
View File

@@ -5,7 +5,11 @@
#include <string.h> #include <string.h>
#include <locale.h> #include <locale.h>
#include <ctype.h> #include <ctype.h>
#ifndef SOLARIS
#include <err.h> #include <err.h>
#else
#define quad_t uint64_t
#endif
#include <errno.h> #include <errno.h>
#include <regex.h> #include <regex.h>
#include <limits.h> #include <limits.h>

4
ast_expr2.y
View File

@@ -18,7 +18,11 @@
#include <string.h> #include <string.h>
#include <locale.h> #include <locale.h>
#include <ctype.h> #include <ctype.h>
#ifndef SOLARIS
#include <err.h> #include <err.h>
#else
#define quad_t uint64_t
#endif
#include <errno.h> #include <errno.h>
#include <regex.h> #include <regex.h>
#include <limits.h> #include <limits.h>

10
res/Makefile
View File

@@ -58,14 +58,16 @@ endif
depend: .depend depend: .depend
.depend: .depend:
@if ! which mpg123 &>/dev/null ; then \ @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \
echo "*** You don't have mpg123 installed. You're going to need ***";\ if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \
echo "*** it if you want MusicOnHold ***";\
elif ! mpg123 --longhelp 2>&1 | grep .59r &>/dev/null ; then \
echo "*************************************************************";\ echo "*************************************************************";\
echo "*** You have the WRONG version of mpg123... you need .59r ***";\ echo "*** You have the WRONG version of mpg123... you need .59r ***";\
echo "*** Use 'make mpg123' to get the right verison ***";\ echo "*** Use 'make mpg123' to get the right verison ***";\
echo "*************************************************************";\ echo "*************************************************************";\
fi ;\
else \
echo "*** You don't have mpg123 installed. You're going to need ***";\
echo "*** it if you want MusicOnHold ***";\
fi fi
../mkdep $(CFLAGS) `ls *.c` ../mkdep $(CFLAGS) `ls *.c`