X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fwwviaudio%2Fwwviaudio.c;h=d6fabfbd761007ab661f120a0dc6fb16b859f78f;hp=870ffa59b8923ee28d671610ec30f208c313c27e;hb=2d17aeeecc0ae1f16398960bd41a2e7047e57c60;hpb=75a31ebff11ab33b40897e628f350f9ab5957a1f;ds=sidebyside

diff --git a/ccan/wwviaudio/wwviaudio.c b/ccan/wwviaudio/wwviaudio.c
index 870ffa59..d6fabfbd 100644
--- a/ccan/wwviaudio/wwviaudio.c
+++ b/ccan/wwviaudio/wwviaudio.c
@@ -29,13 +29,14 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
+#include <inttypes.h>
 
 #define WWVIAUDIO_DEFINE_GLOBALS
 #include "wwviaudio.h"
 #undef WWVIAUDIO_DEFINE_GLOBALS
 
-#include "portaudio.h"
-#include "ccan/ogg_to_pcm/ogg_to_pcm.h"
+#include <portaudio.h>
+#include <ccan/ogg_to_pcm/ogg_to_pcm.h>
 
 #define FRAMES_PER_BUFFER  (1024)
 
@@ -147,8 +148,8 @@ int wwviaudio_read_ogg_clip(int clipnum, char *filename)
 	rc = ogg_to_pcm(filebuf, &clip[clipnum].sample, &samplesize,
 		&sample_rate, &nchannels, &nframes);
 	if (clip[clipnum].sample == NULL) {
-		printf("Can't get memory for sound data for %llu frames in %s\n",
-			nframes, filebuf);
+		printf("Can't get memory for sound data for %"PRIu64
+		       " frames in %s\n", nframes, filebuf);
 		goto error;
 	}
 
@@ -226,7 +227,7 @@ static void decode_paerror(PaError rc)
 {
 	if (rc == paNoError)
 		return;
-	fprintf(stderr, "An error occured while using the portaudio stream\n");
+	fprintf(stderr, "An error occurred while using the portaudio stream\n");
 	fprintf(stderr, "Error number: %d\n", rc);
 	fprintf(stderr, "Error message: %s\n", Pa_GetErrorText(rc));
 }