[xiph-cvs] cvs commit: libshout/src mp3.c

[Brendan]

brendan     03/03/17 19:14:56

  Modified:    .        configure.in
               src      mp3.c
  Removed:     m4       ac_compile_check_sizeof.m4 ac_create_stdint_h.m4
                        type_socklen_t.m4
  Log:
  The previous commits are in my opinion the wrong approach. A couple more
  changes are on the way after this, which just reverts the code to its
  previous version.

Revision  Changes    Path
1.31      +12 -2     libshout/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- configure.in	17 Mar 2003 22:30:22 -0000	1.30
+++ configure.in	18 Mar 2003 00:14:56 -0000	1.31
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.in,v 1.30 2003/03/17 22:30:22 karl Exp $
+# $Id: configure.in,v 1.31 2003/03/18 00:14:56 brendan Exp $
 
 m4_define(libshout_major, 2)
 m4_define(libshout_minor, 0)
@@ -57,13 +57,23 @@
 
 dnl Checks for header files.
 AC_HEADER_STDC
+AC_CHECK_HEADERS([inttypes.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
 dnl Check for types
-TYPE_SOCKLEN_T
-AC_CREATE_STDINT_H(xiphint.h)
+AC_CHECK_TYPE([uint32_t],
+  [AC_DEFINE(HAVE_C99_INTTYPES, 1, [Define if you have the C99 integer types])],
+  [AC_CHECK_SIZEOF(short)
+   AC_CHECK_SIZEOF(int)
+   AC_CHECK_SIZEOF(long)
+   AC_CHECK_SIZEOF(long long)])
+AC_CHECK_TYPES([socklen_t])
+AH_VERBATIM([X_HAVE_SOCKLEN_T],
+  [#ifndef HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif])
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(nanosleep)

<p><p>1.7       +1 -1      libshout/src/mp3.c

Index: mp3.c
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/mp3.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mp3.c	17 Mar 2003 22:30:22 -0000	1.6
+++ mp3.c	18 Mar 2003 00:14:56 -0000	1.7
@@ -1,11 +1,11 @@
 /* mp3.c: libshout MP3 format handler */
 
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <shout/shout.h>
-#include <xiphint.h>
 #include "shout_private.h"
 
 /*

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.