diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-12 02:18:52 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-12 02:18:52 +0000 |
commit | 278b3ae129464e1a309240a37667fecdf7e97ac5 (patch) | |
tree | da69625255a4500c44870334fe9f69e691377c19 | |
parent | fbba89f83b8631f2b5450b0fced0a88e5f9cb64c (diff) | |
download | mpv-278b3ae129464e1a309240a37667fecdf7e97ac5.tar.bz2 mpv-278b3ae129464e1a309240a37667fecdf7e97ac5.tar.xz |
various openbsd and general warning fixes - patch by Björn Sandell <biorn@dce.chalmers.se>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6058 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | liba52/parse.c | 3 | ||||
-rw-r--r-- | libdha/Makefile | 12 | ||||
-rw-r--r-- | libdha/sysdep/pci_openbsd.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd.c | 1 | ||||
-rw-r--r-- | libvo/sub.h | 1 | ||||
-rw-r--r-- | postproc/swscale.c | 2 |
7 files changed, 17 insertions, 6 deletions
@@ -1399,7 +1399,7 @@ else _def_malloc='#undef HAVE_MALLOC_H' fi # malloc.h emits a warning in FreeBSD -freebsd && _def_malloc='#undef HAVE_MALLOC_H' +(freebsd || openbsd) && _def_malloc='#undef HAVE_MALLOC_H' echores "$_malloc" diff --git a/liba52/parse.c b/liba52/parse.c index 9dd80a73a4..d3557019d7 100644 --- a/liba52/parse.c +++ b/liba52/parse.c @@ -35,9 +35,6 @@ #ifdef HAVE_MEMALIGN /* some systems have memalign() but no declaration for it */ void * memalign (size_t align, size_t size); -#else -/* assume malloc alignment is sufficient */ -#define memalign(align,size) malloc (size) #endif typedef struct { diff --git a/libdha/Makefile b/libdha/Makefile index 818cf1cac5..aab984fafa 100644 --- a/libdha/Makefile +++ b/libdha/Makefile @@ -15,6 +15,10 @@ SRCS=libdha.c mtrr.c pci.c pci_names.c OBJS=$(SRCS:.c=.o) CFLAGS = $(OPTFLAGS) -fPIC -I. -I.. -Wall -W +LIBS = +ifeq ($(TARGET_OS),OpenBSD) +LIBS += -li386 +endif .SUFFIXES: .c .o @@ -24,7 +28,7 @@ CFLAGS = $(OPTFLAGS) -fPIC -I. -I.. -Wall -W $(CC) -c $(CFLAGS) -o $@ $< $(LIBNAME): $(OBJS) - $(CC) -shared -o $(LIBNAME) $(OBJS) + $(CC) -shared -o $(LIBNAME) $(OBJS) $(LIBS) ln -sf $(LIBNAME) $(SHORTNAME) all: $(LIBNAME) $(SHORTNAME) @@ -52,8 +56,12 @@ install: mkdir -p $(prefix)/lib install -m 755 -s -p $(LIBNAME) $(prefix)/lib/$(LIBNAME) rm -f $(prefix)/lib/libdha.so - ln -sf $(LIBNAME) $(prefix)/lib/libdha.so + ln -sf $(LIBNAME) $(prefix)/lib/$(SHORTNAME) +ifeq ($(TARGET_OS),OpenBSD) + ldconfig -R +else ldconfig +endif # # include dependency files if they exist diff --git a/libdha/sysdep/pci_openbsd.c b/libdha/sysdep/pci_openbsd.c index 387335c236..13504db818 100644 --- a/libdha/sysdep/pci_openbsd.c +++ b/libdha/sysdep/pci_openbsd.c @@ -5,6 +5,8 @@ */ #include <errno.h> +#include <sys/types.h> +#include <machine/sysarch.h> static __inline__ int enable_os_io(void) { diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index ec198f4cb9..6739809d4d 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -18,6 +18,7 @@ #include "stream.h" #include "demuxer.h" #include "stheader.h" +#include "dec_video.h" #include "vd.h" #include "vf.h" diff --git a/libvo/sub.h b/libvo/sub.h index ab23cae8d6..21482eea80 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -102,6 +102,7 @@ extern void vo_remove_text(int dxs,int dys,void (*remove)(int x0,int y0, int w,i void vo_init_osd(); int vo_update_osd(int dxs,int dys); int vo_osd_changed(int new_value); +int vo_osd_check_range_update(int,int,int,int); extern int vo_osd_changed_flag; diff --git a/postproc/swscale.c b/postproc/swscale.c index d5a788a284..a602de0076 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -55,6 +55,8 @@ untested special converters #include <assert.h> #ifdef HAVE_MALLOC_H #include <malloc.h> +#else +#include <stdlib.h> #endif #include "swscale.h" #include "../cpudetect.h" |