Commit c3cb1cf2 authored by Led's avatar Led

0.9.5

parent 37ebbf14
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
timestamp='2003-10-07' timestamp='2004-01-05'
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
...@@ -221,6 +221,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -221,6 +221,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
mvmeppc:OpenBSD:*:*) mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE} echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
pegasos:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pmax:OpenBSD:*:*) pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE} echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
...@@ -307,6 +310,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -307,6 +310,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:OS/390:*:*) *:OS/390:*:*)
echo i370-ibm-openedition echo i370-ibm-openedition
exit 0 ;; exit 0 ;;
*:OS400:*:*)
echo powerpc-ibm-os400
exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE} echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;; exit 0;;
...@@ -742,6 +748,11 @@ EOF ...@@ -742,6 +748,11 @@ EOF
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;; exit 0 ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
...@@ -986,6 +997,9 @@ EOF ...@@ -986,6 +997,9 @@ EOF
i*86:atheos:*:*) i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos echo ${UNAME_MACHINE}-unknown-atheos
exit 0 ;; exit 0 ;;
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit 0 ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE} echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
...@@ -1172,7 +1186,7 @@ EOF ...@@ -1172,7 +1186,7 @@ EOF
*:QNX:*:4*) *:QNX:*:4*)
echo i386-pc-qnx echo i386-pc-qnx
exit 0 ;; exit 0 ;;
NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE} echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:NonStop-UX:*:*) *:NonStop-UX:*:*)
...@@ -1216,6 +1230,9 @@ EOF ...@@ -1216,6 +1230,9 @@ EOF
SEI:*:*:SEIUX) SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE} echo mips-sei-seiux${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:DRAGONFLY:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
exit 0 ;;
esac esac
#echo '(No uname command or uname output not recognized.)' 1>&2 #echo '(No uname command or uname output not recognized.)' 1>&2
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
timestamp='2003-10-07' timestamp='2004-01-05'
# This file is (in principle) common to ALL GNU software. # This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software # The presence of a machine in this file suggests that SOME GNU software
...@@ -118,7 +118,8 @@ esac ...@@ -118,7 +118,8 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations. # Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;; ;;
...@@ -379,6 +380,9 @@ case $basic_machine in ...@@ -379,6 +380,9 @@ case $basic_machine in
amd64) amd64)
basic_machine=x86_64-pc basic_machine=x86_64-pc
;; ;;
amd64-*)
basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
amdahl) amdahl)
basic_machine=580-amdahl basic_machine=580-amdahl
os=-sysv os=-sysv
...@@ -743,6 +747,10 @@ case $basic_machine in ...@@ -743,6 +747,10 @@ case $basic_machine in
basic_machine=or32-unknown basic_machine=or32-unknown
os=-coff os=-coff
;; ;;
os400)
basic_machine=powerpc-ibm
os=-os400
;;
OSE68000 | ose68000) OSE68000 | ose68000)
basic_machine=m68000-ericsson basic_machine=m68000-ericsson
os=-ose os=-ose
...@@ -963,6 +971,10 @@ case $basic_machine in ...@@ -963,6 +971,10 @@ case $basic_machine in
tower | tower-32) tower | tower-32)
basic_machine=m68k-ncr basic_machine=m68k-ncr
;; ;;
tpf)
basic_machine=s390x-ibm
os=-tpf
;;
udi29k) udi29k)
basic_machine=a29k-amd basic_machine=a29k-amd
os=-udi os=-udi
...@@ -1137,13 +1149,13 @@ case $os in ...@@ -1137,13 +1149,13 @@ case $os in
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei*) | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
# Remember, each alternative MUST END IN *, to match a version number. # Remember, each alternative MUST END IN *, to match a version number.
;; ;;
-qnx*) -qnx*)
...@@ -1182,6 +1194,9 @@ case $os in ...@@ -1182,6 +1194,9 @@ case $os in
-opened*) -opened*)
os=-openedition os=-openedition
;; ;;
-os400*)
os=-os400
;;
-wince*) -wince*)
os=-wince os=-wince
;; ;;
...@@ -1203,6 +1218,9 @@ case $os in ...@@ -1203,6 +1218,9 @@ case $os in
-atheos*) -atheos*)
os=-atheos os=-atheos
;; ;;
-syllable*)
os=-syllable
;;
-386bsd) -386bsd)
os=-bsd os=-bsd
;; ;;
...@@ -1225,6 +1243,9 @@ case $os in ...@@ -1225,6 +1243,9 @@ case $os in
-sinix*) -sinix*)
os=-sysv4 os=-sysv4
;; ;;
-tpf*)
os=-tpf
;;
-triton*) -triton*)
os=-sysv3 os=-sysv3
;; ;;
...@@ -1473,9 +1494,15 @@ case $basic_machine in ...@@ -1473,9 +1494,15 @@ case $basic_machine in
-mvs* | -opened*) -mvs* | -opened*)
vendor=ibm vendor=ibm
;; ;;
-os400*)
vendor=ibm
;;
-ptx*) -ptx*)
vendor=sequent vendor=sequent
;; ;;
-tpf*)
vendor=ibm
;;
-vxsim* | -vxworks* | -windiss*) -vxsim* | -vxworks* | -windiss*)
vendor=wrs vendor=wrs
;; ;;
......
AC_INIT(src/main.c) AC_INIT(src/main.c)
AM_INIT_AUTOMAKE(mpd, 0.9.4) AM_INIT_AUTOMAKE(mpd, 0.9.5)
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
......
...@@ -56,7 +56,7 @@ modename="$progname" ...@@ -56,7 +56,7 @@ modename="$progname"
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
VERSION=1.5.0a VERSION=1.5.0a
TIMESTAMP=" (1.1220.2.35 2003/11/12 18:51:58) Debian$Rev: 159 $" TIMESTAMP=" (1.1220.2.35 2003/11/12 18:51:58) Debian$Rev: 179 $"
default_mode= default_mode=
help="Try \`$progname --help' for more information." help="Try \`$progname --help' for more information."
...@@ -858,7 +858,7 @@ EOF ...@@ -858,7 +858,7 @@ EOF
;; ;;
esac esac
libtool_args="$nonopt" libtool_args="$nonopt"
base_compile="$nonopt" base_compile="$nonopt $@"
compile_command="$nonopt" compile_command="$nonopt"
finalize_command="$nonopt" finalize_command="$nonopt"
...@@ -908,7 +908,7 @@ EOF ...@@ -908,7 +908,7 @@ EOF
# Only attempt this if the compiler in the base link # Only attempt this if the compiler in the base link
# command doesn't match the default compiler. # command doesn't match the default compiler.
if test -n "$available_tags" && test -z "$tagname"; then if test -n "$available_tags" && test -z "$tagname"; then
case "$base_compile " in case $base_compile in
# Blanks in the command may have been stripped by the calling shell, # Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run. # but not from the CC environment variable when configure was run.
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
...@@ -919,7 +919,7 @@ EOF ...@@ -919,7 +919,7 @@ EOF
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
# Evaluate the configuration. # Evaluate the configuration.
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
case "$base_compile " in case $base_compile in
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
# The compiler in $compile_command matches # The compiler in $compile_command matches
# the one in the tagged configuration. # the one in the tagged configuration.
...@@ -975,7 +975,6 @@ EOF ...@@ -975,7 +975,6 @@ EOF
# Go through the arguments, transforming them on the way. # Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do while test "$#" -gt 0; do
arg="$1" arg="$1"
base_compile="$base_compile $arg"
shift shift
case $arg in case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
...@@ -5638,7 +5637,7 @@ relink_command=\"$relink_command\"" ...@@ -5638,7 +5637,7 @@ relink_command=\"$relink_command\""
tmpdir="/tmp" tmpdir="/tmp"
test -n "$TMPDIR" && tmpdir="$TMPDIR" test -n "$TMPDIR" && tmpdir="$TMPDIR"
tmpdir="$tmpdir/libtool-$$" tmpdir="$tmpdir/libtool-$$"
if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
else else
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
continue continue
......
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
/* /* Define to enable diagnostic debugging support. */
Define to enable diagnostic debugging support. */
#undef DEBUG #undef DEBUG
/* /* Define to 1 if you have the <assert.h> header file. */
Define to 1 if you have the <assert.h>
header file. */
#undef HAVE_ASSERT_H #undef HAVE_ASSERT_H
/* /* Define to 1 if you have the <dlfcn.h> header file. */
Define to 1 if you have the <dlfcn.h>
header file. */
#undef HAVE_DLFCN_H #undef HAVE_DLFCN_H
/* /* Define to 1 if you have the `ftruncate' function. */
Define to 1 if you have the `ftruncate'
function. */
#undef HAVE_FTRUNCATE #undef HAVE_FTRUNCATE
/* /* Define to 1 if you have the <inttypes.h> header file. */
Define to 1 if you have the <inttypes.h>
header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
/* /* Define to 1 if you have the `z' library (-lz). */
Define to 1 if you have the `z'
library (-lz). */
#undef HAVE_LIBZ #undef HAVE_LIBZ
/* /* Define to 1 if you have the <memory.h> header file. */
Define to 1 if you have the <memory.h>
header file. */
#undef HAVE_MEMORY_H #undef HAVE_MEMORY_H
/* /* Define to 1 if you have the <stdint.h> header file. */
Define to 1 if you have the <stdint.h>
header file. */
#undef HAVE_STDINT_H #undef HAVE_STDINT_H
/* /* Define to 1 if you have the <stdlib.h> header file. */
Define to 1 if you have the <stdlib.h>
header file. */
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
/* /* Define to 1 if you have the <strings.h> header file. */
Define to 1 if you have the <strings.h>
header file. */
#undef HAVE_STRINGS_H #undef HAVE_STRINGS_H
/* /* Define to 1 if you have the <string.h> header file. */
Define to 1 if you have the <string.h>
header file. */
#undef HAVE_STRING_H #undef HAVE_STRING_H
/* /* Define to 1 if you have the <sys/stat.h> header file. */
Define to 1 if you have the <sys/stat.h>
header file. */
#undef HAVE_SYS_STAT_H #undef HAVE_SYS_STAT_H
/* /* Define to 1 if you have the <sys/types.h> header file. */
Define to 1 if you have the <sys/types.h>
header file. */
#undef HAVE_SYS_TYPES_H #undef HAVE_SYS_TYPES_H
/* /* Define to 1 if you have the <unistd.h> header file. */
Define to 1 if you have the <unistd.h>
header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* /* Define to disable debugging assertions. */
Define to disable debugging assertions. */
#undef NDEBUG #undef NDEBUG
/* /* Name of package */
Name of package */
#undef PACKAGE #undef PACKAGE
/* /* Define to the address where bug reports for this package should be sent. */
Define to the address where bug reports for
this package should be sent. */
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT
/* /* Define to the full name of this package. */
Define to the full name of this package.
*/
#undef PACKAGE_NAME #undef PACKAGE_NAME
/* /* Define to the full name and version of this package. */
Define to the full name and version of
this package. */
#undef PACKAGE_STRING #undef PACKAGE_STRING
/* /* Define to the one symbol short name of this package. */
Define to the one symbol short name of
this package. */
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
/* /* Define to the version of this package. */
Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
/* /* Define to 1 if you have the ANSI C header files. */
Define to 1 if you have the ANSI
C header files. */
#undef STDC_HEADERS #undef STDC_HEADERS
/* /* Version number of package */
Version number of package */
#undef VERSION #undef VERSION
/* /* Define to empty if `const' does not conform to ANSI C. */
Define to empty if `const' does not conform
to ANSI C. */
#undef const #undef const
/* Define to `__inline__' or `__inline' if that's what the C compiler /* Define to `__inline__' or `__inline' if that's what the C compiler
......
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
/* /* Define to enable diagnostic debugging support. */
Define to enable diagnostic debugging support. */
#undef DEBUG #undef DEBUG
/* /* Define to enable experimental code. */
Define to enable experimental code. */
#undef EXPERIMENTAL #undef EXPERIMENTAL
/* /* Define to 1 if you have the <assert.h> header file. */
Define to 1 if you have the <assert.h>
header file. */
#undef HAVE_ASSERT_H #undef HAVE_ASSERT_H
/* /* Define to 1 if you have the <dlfcn.h> header file. */
Define to 1 if you have the <dlfcn.h>
header file. */
#undef HAVE_DLFCN_H #undef HAVE_DLFCN_H
/* /* Define to 1 if you have the <errno.h> header file. */
Define to 1 if you have the <errno.h>
header file. */
#undef HAVE_ERRNO_H #undef HAVE_ERRNO_H
/* /* Define to 1 if you have the `fcntl' function. */
Define to 1 if you have the `fcntl'
function. */
#undef HAVE_FCNTL #undef HAVE_FCNTL
/* /* Define to 1 if you have the <fcntl.h> header file. */
Define to 1 if you have the <fcntl.h>
header file. */
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H
/* /* Define to 1 if you have the `fork' function. */
Define to 1 if you have the `fork'
function. */
#undef HAVE_FORK #undef HAVE_FORK
/* /* Define to 1 if you have the <inttypes.h> header file. */
Define to 1 if you have the <inttypes.h>
header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
/* /* Define to 1 if you have the <limits.h> header file. */
Define to 1 if you have the <limits.h>
header file. */
#undef HAVE_LIMITS_H #undef HAVE_LIMITS_H
/* /* Define if your MIPS CPU supports a 2-operand MADD16 instruction. */
Define if your MIPS CPU supports a 2-operand
MADD16 instruction. */
#undef HAVE_MADD16_ASM #undef HAVE_MADD16_ASM
/* /* Define if your MIPS CPU supports a 2-operand MADD instruction. */
Define if your MIPS CPU supports a 2-operand
MADD instruction. */
#undef HAVE_MADD_ASM #undef HAVE_MADD_ASM
/* /* Define to 1 if you have the <memory.h> header file. */
Define to 1 if you have the <memory.h>
header file. */
#undef HAVE_MEMORY_H #undef HAVE_MEMORY_H
/* /* Define to 1 if you have the `pipe' function. */
Define to 1 if you have the `pipe'
function. */
#undef HAVE_PIPE #undef HAVE_PIPE
/* /* Define to 1 if you have the <stdint.h> header file. */
Define to 1 if you have the <stdint.h>
header file. */
#undef HAVE_STDINT_H #undef HAVE_STDINT_H
/* /* Define to 1 if you have the <stdlib.h> header file. */
Define to 1 if you have the <stdlib.h>
header file. */
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
/* /* Define to 1 if you have the <strings.h> header file. */
Define to 1 if you have the <strings.h>
header file. */
#undef HAVE_STRINGS_H #undef HAVE_STRINGS_H
/* /* Define to 1 if you have the <string.h> header file. */
Define to 1 if you have the <string.h>
header file. */
#undef HAVE_STRING_H #undef HAVE_STRING_H
/* /* Define to 1 if you have the <sys/stat.h> header file. */
Define to 1 if you have the <sys/stat.h>
header file. */
#undef HAVE_SYS_STAT_H #undef HAVE_SYS_STAT_H
/* /* Define to 1 if you have the <sys/types.h> header file. */
Define to 1 if you have the <sys/types.h>
header file. */
#undef HAVE_SYS_TYPES_H #undef HAVE_SYS_TYPES_H
/* /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
Define to 1 if you have <sys/wait.h> that
is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H #undef HAVE_SYS_WAIT_H
/* /* Define to 1 if you have the <unistd.h> header file. */
Define to 1 if you have the <unistd.h>
header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* /* Define to 1 if you have the `waitpid' function. */
Define to 1 if you have the `waitpid'
function. */
#undef HAVE_WAITPID #undef HAVE_WAITPID
/* /* Define to disable debugging assertions. */
Define to disable debugging assertions. */
#undef NDEBUG #undef NDEBUG
/* /* Define to optimize for accuracy over speed. */
Define to optimize for accuracy over speed. */
#undef OPT_ACCURACY #undef OPT_ACCURACY
/* /* Define to optimize for speed over accuracy. */
Define to optimize for speed over accuracy. */
#undef OPT_SPEED #undef OPT_SPEED
/* /* Define to enable a fast subband synthesis approximation optimization. */
Define to enable a fast subband synthesis approximation
optimization. */
#undef OPT_SSO #undef OPT_SSO
/* /* Define to influence a strict interpretation of the ISO/IEC standards, even
Define to influence a strict interpretation of the if this is in opposition with best accepted practices. */
ISO/IEC standards, even if this is in opposition
with best accepted practices. */
#undef OPT_STRICT #undef OPT_STRICT
/* /* Name of package */
Name of package */
#undef PACKAGE #undef PACKAGE
/* /* Define to the address where bug reports for this package should be sent. */
Define to the address where bug reports for
this package should be sent. */
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT
/* /* Define to the full name of this package. */
Define to the full name of this package.
*/
#undef PACKAGE_NAME #undef PACKAGE_NAME
/* /* Define to the full name and version of this package. */
Define to the full name and version of
this package. */
#undef PACKAGE_STRING #undef PACKAGE_STRING
/* /* Define to the one symbol short name of this package. */
Define to the one symbol short name of
this package. */
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
/* /* Define to the version of this package. */
Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
/* /* The size of a `int', as computed by sizeof. */
The size of a `int', as computed by
sizeof. */
#undef SIZEOF_INT #undef SIZEOF_INT
/* /* The size of a `long', as computed by sizeof. */
The size of a `long', as computed by
sizeof. */
#undef SIZEOF_LONG #undef SIZEOF_LONG
/* /* The size of a `long long', as computed by sizeof. */
The size of a `long long', as computed
by sizeof. */
#undef SIZEOF_LONG_LONG #undef SIZEOF_LONG_LONG
/* /* Define to 1 if you have the ANSI C header files. */
Define to 1 if you have the ANSI
C header files. */
#undef STDC_HEADERS #undef STDC_HEADERS
/* /* Version number of package */
Version number of package */
#undef VERSION #undef VERSION
/* /* Define to empty if `const' does not conform to ANSI C. */
Define to empty if `const' does not conform
to ANSI C. */
#undef const #undef const
/* Define to `__inline__' or `__inline' if that's what the C compiler /* Define to `__inline__' or `__inline' if that's what the C compiler
...@@ -199,7 +127,5 @@ ...@@ -199,7 +127,5 @@
#undef inline #undef inline
#endif #endif
/* /* Define to `int' if <sys/types.h> does not define. */
Define to `int' if <sys/types.h> does not define.
*/
#undef pid_t #undef pid_t
...@@ -190,7 +190,8 @@ MpdTag * oggTagDup(char * file) { ...@@ -190,7 +190,8 @@ MpdTag * oggTagDup(char * file) {
while(*comments) { while(*comments) {
temp = strdup(*comments); temp = strdup(*comments);
s1 = strtok(temp,"="); ++comments;
if(!(s1 = strtok(temp,"="))) continue;
s2 = strtok(NULL,"="); s2 = strtok(NULL,"=");
if(0==strcasecmp(s1,"artist")) { if(0==strcasecmp(s1,"artist")) {
if(!ret->artist && s2) { if(!ret->artist && s2) {
...@@ -221,7 +222,6 @@ MpdTag * oggTagDup(char * file) { ...@@ -221,7 +222,6 @@ MpdTag * oggTagDup(char * file) {
} }
} }
free(temp); free(temp);
++comments;
} }
ov_clear(&vf); ov_clear(&vf);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment