RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 20:27:23 +00:00
Code Issues Releases Wiki Activity

various openbsd and general warning fixes - patch by Björn Sandell <biorn@dce.chalmers.se>

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6058 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-05-12 02:18:52 +00:00
parent fbba89f83b
commit 278b3ae129
7 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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"

3
liba52/parse.c
View File

@ -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 {

12
libdha/Makefile
View File

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

2
libdha/sysdep/pci_openbsd.c
View File

@ -5,6 +5,8 @@
*/
#include <errno.h>
#include <sys/types.h>
#include <machine/sysarch.h>
static __inline__ int enable_os_io(void)
{

1
libmpcodecs/vd.c
View File

@ -18,6 +18,7 @@
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "dec_video.h"
#include "vd.h"
#include "vf.h"

1
libvo/sub.h
View File

@ -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;

2
postproc/swscale.c
View File

@ -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"