View | Details | Raw Unified | Return to bug 234909
Collapse All | Expand All

(-)audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h (-4 / +3 lines)
Lines 1-13 Link Here
1
--- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig	2019-01-06 18:38:02 UTC
1
--- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig	2019-01-12 19:57:42 UTC
2
+++ kernel/OS/FreeBSD/wrapper/bsddefs.h
2
+++ kernel/OS/FreeBSD/wrapper/bsddefs.h
3
@@ -91,7 +91,10 @@ typedef int ddi_iblock_cookie_t;
3
@@ -91,6 +91,9 @@ typedef int ddi_iblock_cookie_t;
4
 extern void oss_udelay (unsigned long t);
4
 extern void oss_udelay (unsigned long t);
5
 
5
 
6
 #ifdef _KERNEL
6
 #ifdef _KERNEL
7
+#ifdef memset
7
+#ifdef memset
8
+#undef memset
8
+#undef memset
9
+#endif
9
 #define memset oss_memset
10
 #define memset oss_memset
10
+#endif
11
 extern void *oss_memset (void *t, int val, int l);
11
 extern void *oss_memset (void *t, int val, int l);
12
 #endif
12
 #endif
13
 

Return to bug 234909