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

[Jack Moffitt]

jack        01/10/20 14:43:57

  Modified:    include/shout shout.h
               src      shout.c
  Log:
  Get rid of 'long long'.

Revision  Changes    Path
1.2       +13 -2     libshout/include/shout/shout.h

Index: shout.h
===================================================================
RCS file: /usr/local/cvsroot/libshout/include/shout/shout.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shout.h	2001/09/10 02:24:40	1.1
+++ shout.h	2001/10/20 21:43:56	1.2
@@ -5,6 +5,17 @@
 #ifndef __LIBSHOUT_SHOUT_H__
 #define __LIBSHOUT_SHOUT_H__
 
+#ifdef _WIN32
+typedef int64_t __int64
+typedef uint64_t unsigned __int64
+#else
+# ifdef __GLIBC__
+#  include <stdint.h>
+# endif
+#endif
+
+#include <sys/types.h>
+
 #include <ogg/ogg.h>
 
 #ifdef __cplusplus
@@ -36,8 +47,8 @@
         int error;
         int pages;		/* total pages broadcasted */
 
-	long long _starttime;	/* start of this period's timeclock */
-	long long _senttime;	/* amout of data we've sent (in milliseconds) */
+	uint64_t _starttime;	/* start of this period's timeclock */
+	uint64_t _senttime;	/* amout of data we've sent (in milliseconds) */
         int _samples;	        /* the number of samples for the current page */
         int _oldsamples;
         int _samplerate;  	/* the samplerate of the stream */

1.2       +1 -1      libshout/src/shout.c

Index: shout.c
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/shout.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shout.c	2001/09/10 02:24:40	1.1
+++ shout.c	2001/10/20 21:43:56	1.2
@@ -157,7 +157,7 @@
 
 void shout_sleep(shout_conn_t *self)
 {
-	long long sleep;
+	uint64_t sleep;
 
         if (self->_senttime == 0) return;
 

--- >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.