Definition problems with SPINUNINIT (too many arguments) and mtx_destroy
(not defined at all via includes or other) under FreeBSD 4.7-RELEASE
causing `make -f Makefile.bsd' to fail, corrected.
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd
===================================================================
RCS file:
/cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kern
el/Makefile.bsd,v
retrieving revision 1.7
diff -u -d -r1.7 Makefile.bsd
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd 21
Feb 2
003 23:23:02 -0000 1.7
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd 26
Feb 2
003 00:16:13 -0000
@@ -1,6 +1,6 @@
# $FreeBSD$
# i810, i830 & sis are not complete
-SUBDIR = mga r128 radeon tdfx # i810 i830 sis gamma
+SUBDIR = radeon tdfx # i810 i830 sis gamma
.include <bsd.subdir.mk>
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_drv.h
===================================================================
RCS file:
/cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kern
el/drm_drv.h,v
retrieving revision 1.10
diff -u -d -r1.10 drm_drv.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_drv.h 22
Feb 2
003 18:40:12 -0000 1.10
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_drv.h 26
Feb 2
003 00:16:17 -0000
@@ -870,6 +870,7 @@
DRIVER_POSTCLEANUP();
DRM(mem_uninit)();
DRM_SPINUNINIT(dev->count_lock);
+
}
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h
===================================================================
RCS file:
/cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kern
el/drm_os_freebsd.h,v
retrieving revision 1.12
diff -u -d -r1.12 drm_os_freebsd.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h
2
1 Feb 2003 23:23:04 -0000 1.12
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h
2
6 Feb 2003 00:16:19 -0000
@@ -78,7 +78,7 @@
#define DRM_CURPROC curthread
#define DRM_STRUCTPROC struct thread
#define DRM_SPINTYPE struct mtx
-#define DRM_SPININIT(l,name) mtx_init(&l, name, NULL, MTX_DEF)
+#define DRM_SPININIT(l) mtx_init(&l, name, NULL, MTX_DEF)
#define DRM_SPINUNINIT(l) mtx_destroy(&l)
#define DRM_SPINLOCK(l) mtx_lock(l)
#define DRM_SPINUNLOCK(u) mtx_unlock(u);
@@ -88,7 +88,10 @@
#define DRM_STRUCTPROC struct proc
#define DRM_SPINTYPE struct simplelock
#define DRM_SPININIT(l,name) simple_lock_init(&l)
-#define DRM_SPINUNINIT(l,name)
+
+#define mtx_destroy(a)
+#define DRM_SPINUNINIT(l) mtx_destroy(&l)
+
#define DRM_SPINLOCK(l) simple_lock(l)
#define DRM_SPINUNLOCK(u) simple_unlock(u);
#define DRM_CURRENTPID curproc->p_pid
-------------------------------------------------------
This SF.net email is sponsored by: Scholarships for Techies!
Can't afford IT training? All 2003 ictp students receive scholarships.
Get hands-on training in Microsoft, Cisco, Sun, Linux/UNIX, and more.
www.ictp.com/training/sourceforge.asp
_______________________________________________
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel
