[xine-cvs] CVS: xine-lib/src/video_out/libdha Makefile.am,1.9,1.10 mmi.c,1.4,1.5

[James S. <jst...@us...>]

Update of /cvsroot/xine/xine-lib/src/video_out/libdha
In directory sc8-pr-cvs1:/tmp/cvs-serv2890/libdha

Modified Files:
	Makefile.am mmi.c 
Log Message:
sync with vidix cvs


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/libdha/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am	14 May 2003 16:21:54 -0000	1.9
+++ Makefile.am	13 Jan 2004 21:56:14 -0000	1.10
@@ -21,7 +21,7 @@
 test_SOURCES = test.c
 test_LDADD = $(top_builddir)/src/video_out/libdha/libdha.la
 
-noinst_HEADERS = AsmMacros.h config.h libdha.h pci_ids.h pci_names.h pci_vendors.h
+noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h
 
 ## for OpenBSD LIBS += -li386
 

Index: mmi.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/libdha/mmi.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mmi.c	16 Nov 2003 17:18:10 -0000	1.4
+++ mmi.c	13 Jan 2004 21:56:14 -0000	1.5
@@ -69,8 +69,8 @@
 	if(ioctl(libdha_fd,DHAHELPER_ALLOC_PA,&vmi) == 0)
 		return vmi.addr;
     }
-    return 0;
 #endif
+    return NULL;
 }
 
 void	bm_free_pci_shmem(void * pci_shmem)