summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gui/bitmap.c3
-rw-r--r--Gui/bitmap/bitmap.c3
-rw-r--r--Gui/bitmap/bmp/bmp.c3
-rw-r--r--Gui/timer.h2
-rw-r--r--libao2/ao_oss.c3
-rw-r--r--libmpeg2/decode.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/Gui/bitmap.c b/Gui/bitmap.c
index 8343058ce2..f47858095b 100644
--- a/Gui/bitmap.c
+++ b/Gui/bitmap.c
@@ -1,6 +1,7 @@
-#include <stdlib.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include "bitmap.h"
#include "../error.h"
diff --git a/Gui/bitmap/bitmap.c b/Gui/bitmap/bitmap.c
index 8343058ce2..f47858095b 100644
--- a/Gui/bitmap/bitmap.c
+++ b/Gui/bitmap/bitmap.c
@@ -1,6 +1,7 @@
-#include <stdlib.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include "bitmap.h"
#include "../error.h"
diff --git a/Gui/bitmap/bmp/bmp.c b/Gui/bitmap/bmp/bmp.c
index f4a80308bf..cd57da789a 100644
--- a/Gui/bitmap/bmp/bmp.c
+++ b/Gui/bitmap/bmp/bmp.c
@@ -21,8 +21,9 @@
50.53 : Res
*/
-#include <stdlib.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include "bmp.h"
#include "../bitmap.h"
diff --git a/Gui/timer.h b/Gui/timer.h
index 800c0dcac1..fbd3b95d06 100644
--- a/Gui/timer.h
+++ b/Gui/timer.h
@@ -9,4 +9,4 @@ extern void timerSetHandler( timerTSigHandler handler );
extern void timerInit( void );
extern void timerDone( void );
-#endif; \ No newline at end of file
+#endif
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index 78c3c17cd0..b65b1ce679 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -93,11 +93,8 @@ static int control(int cmd,int arg){
close(fd);
return CONTROL_OK;
}
- else
- return CONTROL_ERROR;
}
return CONTROL_ERROR;
- default:
}
return CONTROL_UNKNOWN;
}
diff --git a/libmpeg2/decode.c b/libmpeg2/decode.c
index ba0025043d..3e7e3bde05 100644
--- a/libmpeg2/decode.c
+++ b/libmpeg2/decode.c
@@ -115,7 +115,7 @@ void mpeg2_allocate_image_buffers (picture_t * picture)
#else
for(i=0;i<3;i++){
#endif
- base = memalign(64,buff_size);
+ base = (unsigned char *)memalign(64,buff_size);
frames[i].base[0] = base;
frames[i].base[1] = base + frame_size * 5 / 4;
frames[i].base[2] = base + frame_size;