[xiph-commits] r9186 - in trunk/speex: . include/speex symbian win32
jm at motherfish-iii.xiph.org
jm at motherfish-iii.xiph.org
Tue Apr 26 00:10:26 PDT 2005
Author: jm
Date: 2005-04-26 00:10:24 -0700 (Tue, 26 Apr 2005)
New Revision: 9186
Added:
trunk/speex/symbian/speex_types.h
trunk/speex/win32/speex_types.h
Modified:
trunk/speex/configure.ac
trunk/speex/include/speex/Makefile.am
Log:
speex_types.h for win32 and symbian
Modified: trunk/speex/configure.ac
===================================================================
--- trunk/speex/configure.ac 2005-04-26 01:55:52 UTC (rev 9185)
+++ trunk/speex/configure.ac 2005-04-26 07:10:24 UTC (rev 9186)
@@ -36,40 +36,8 @@
AC_C_INLINE
AC_C_RESTRICT
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-if test x$has_char16 = "xyes" ; then
- case 1 in
- $ac_cv_sizeof_short) SIZE16="short";;
- $ac_cv_sizeof_int) SIZE16="int";;
- esac
-else
- case 2 in
- $ac_cv_sizeof_short) SIZE16="short";;
- $ac_cv_sizeof_int) SIZE16="int";;
- esac
-fi
-if test x$has_char16 = "xyes" ; then
- case 2 in
- $ac_cv_sizeof_int) SIZE32="int";;
- $ac_cv_sizeof_long) SIZE32="long";;
- $ac_cv_sizeof_short) SIZE32="short";;
- esac
-else
- case 4 in
- $ac_cv_sizeof_int) SIZE32="int";;
- $ac_cv_sizeof_long) SIZE32="long";;
- $ac_cv_sizeof_short) SIZE32="short";;
- esac
-fi
-
-AC_SUBST(SIZE16)
-AC_SUBST(SIZE32)
-
AC_MSG_CHECKING(for C99 variable-size arrays)
AC_TRY_RUN([
int foo=10;
@@ -166,6 +134,7 @@
AC_ARG_ENABLE(ti-c55x, [ --enable-ti-c55x Enable support for TI C55X DSP],
[if test "$enableval" = yes; then
+ has_char16=yes;
AC_DEFINE([TI_C55X], , [Enable support for TI C55X DSP])
fi])
@@ -174,6 +143,40 @@
AC_DEFINE([PRECISION16], , [Reduce precision to 16 bits (EXPERIMENTAL)])
fi])
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+
+if test x$has_char16 = "xyes" ; then
+ case 1 in
+ $ac_cv_sizeof_short) SIZE16="short";;
+ $ac_cv_sizeof_int) SIZE16="int";;
+ esac
+else
+ case 2 in
+ $ac_cv_sizeof_short) SIZE16="short";;
+ $ac_cv_sizeof_int) SIZE16="int";;
+ esac
+fi
+
+if test x$has_char16 = "xyes" ; then
+ case 2 in
+ $ac_cv_sizeof_int) SIZE32="int";;
+ $ac_cv_sizeof_long) SIZE32="long";;
+ $ac_cv_sizeof_short) SIZE32="short";;
+ esac
+else
+ case 4 in
+ $ac_cv_sizeof_int) SIZE32="int";;
+ $ac_cv_sizeof_long) SIZE32="long";;
+ $ac_cv_sizeof_short) SIZE32="short";;
+ esac
+fi
+
+AC_SUBST(SIZE16)
+AC_SUBST(SIZE32)
+
AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
include/Makefile include/speex/Makefile speex.pc
win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile
Modified: trunk/speex/include/speex/Makefile.am
===================================================================
--- trunk/speex/include/speex/Makefile.am 2005-04-26 01:55:52 UTC (rev 9185)
+++ trunk/speex/include/speex/Makefile.am 2005-04-26 07:10:24 UTC (rev 9186)
@@ -2,7 +2,6 @@
#AUTOMAKE_OPTIONS = no-dependencies
pkginclude_HEADERS = speex.h \
- speex_types.h \
speex_bits.h \
speex_header.h \
speex_callbacks.h \
Added: trunk/speex/symbian/speex_types.h
===================================================================
--- trunk/speex/symbian/speex_types.h 2005-04-26 01:55:52 UTC (rev 9185)
+++ trunk/speex/symbian/speex_types.h 2005-04-26 07:10:24 UTC (rev 9186)
@@ -0,0 +1,40 @@
+/*
+ Copyright (C) 2005 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef SPEEX_TYPES_H
+#define SPEEX_TYPES_H
+
+typedef signed short spx_int16_t;
+typedef signed long spx_int32_t;
+typedef unsigned long spx_uint32_t;
+
+#endif /* ! SPEEX_TYPES_H */
Added: trunk/speex/win32/speex_types.h
===================================================================
--- trunk/speex/win32/speex_types.h 2005-04-26 01:55:52 UTC (rev 9185)
+++ trunk/speex/win32/speex_types.h 2005-04-26 07:10:24 UTC (rev 9186)
@@ -0,0 +1,9 @@
+#ifndef __SPEEX_TYPES_H__
+#define __SPEEX_TYPES_H__
+
+typedef short spx_int16_t;
+typedef int spx_int32_t;
+typedef unsigned int spx_uint32_t;
+
+#endif
+
More information about the commits
mailing list