Attachment #458318 for bug #603762




# else
typedef unsigned char bool;
# endif
enum mybool{false=0,true=1};
#  define true  (1)
# endif
# ifndef false
#  define false (0)
# endif
#endif

/**




# else
typedef unsigned char bool;
# endif
enum mybool{false=0,true=1};
#  define true  (1)
# endif
# ifndef false
#  define false (0)
# endif
#endif

/**




# else
typedef unsigned char bool;
# endif
enum mybool{false=0,true=1};
#  define true  (1)
# endif
# ifndef false
#  define false (0)
# endif
#endif

/**




# else
typedef unsigned char bool;
# endif
enum mybool{false=0,true=1};
#  define true  (1)
# endif
# ifndef false
#  define false (0)
# endif
#endif

/**

Lines 32-39 Link Here

(-)vboxdrv/r0drv/linux/string.h.ORIG (-2 / +1 lines)
32	RT_C_DECLS_BEGIN	32	RT_C_DECLS_BEGIN
33	#ifndef bool /* Linux 2.6.19 C++ nightmare */	33	#ifndef bool /* Linux 2.6.19 C++ nightmare */
34	#define bool bool_type	34	#define bool bool_type
35	#define true true_type	35	enum mybool{false=false_type,true=true_type};
36	#define false false_type
37	#define _Bool int	36	#define _Bool int
38	#define bool_type_r0drv_string_h__	37	#define bool_type_r0drv_string_h__
39	#endif	38	#endif

Lines 1018-1023 Link Here

(-)vboxdrv/r0drv/linux/memobj-r0drv-linux.c.ORIG (+8 lines)
1018	PRTR0MEMOBJLNX pMemLnx;	1018	PRTR0MEMOBJLNX pMemLnx;
1019	int rc = VERR_NO_MEMORY;	1019	int rc = VERR_NO_MEMORY;
1020	int const fWrite = fAccess & RTMEM_PROT_WRITE ? 1 : 0;	1020	int const fWrite = fAccess & RTMEM_PROT_WRITE ? 1 : 0;
		1021	# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
		1022	int locked;
		1023	# endif
1021		1024
1022	/*	1025	/*
1023	* Check for valid task and size overflows.	1026	* Check for valid task and size overflows.
Lines 1078-1084 Link Here
1078	fWrite, /* force write access. */	1081	fWrite, /* force write access. */
1079	# endif	1082	# endif
1080	&pMemLnx->apPages[0], /* Page array. */	1083	&pMemLnx->apPages[0], /* Page array. */
		1084	# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
		1085	papVMAs, /* vmas */
		1086	&locked);
		1087	# else
1081	papVMAs); /* vmas */	1088	papVMAs); /* vmas */
		1089	#endif
1082	#else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) */	1090	#else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) */
1083	rc = get_user_pages(pTask, /* Task for fault accounting. */	1091	rc = get_user_pages(pTask, /* Task for fault accounting. */
1084	pTask->mm, /* Whose pages. */	1092	pTask->mm, /* Whose pages. */

Lines 180-186 Link Here

(-)vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c.ORIG (-2 / +1 lines)
180	RTCpuSetEmpty(&g_MpPendingOfflineSet);	180	RTCpuSetEmpty(&g_MpPendingOfflineSet);
181	# endif	181	# endif
182		182
183	rc = register_cpu_notifier(&g_NotifierBlock);	183	rc = 0;
184	IPRT_LINUX_RESTORE_EFL_AC();	184	IPRT_LINUX_RESTORE_EFL_AC();
185	AssertMsgReturn(!rc, ("%d\n", rc), RTErrConvertFromErrno(rc));	185	AssertMsgReturn(!rc, ("%d\n", rc), RTErrConvertFromErrno(rc));
186	return VINF_SUCCESS;	186	return VINF_SUCCESS;
Lines 190-196 Link Here
190	DECLHIDDEN(void) rtR0MpNotificationNativeTerm(void)	190	DECLHIDDEN(void) rtR0MpNotificationNativeTerm(void)
191	{	191	{
192	IPRT_LINUX_SAVE_EFL_AC();	192	IPRT_LINUX_SAVE_EFL_AC();
193	unregister_cpu_notifier(&g_NotifierBlock);
194	IPRT_LINUX_RESTORE_EFL_AC();	193	IPRT_LINUX_RESTORE_EFL_AC();
195	}	194	}
196		195

Return to bug 603762

Lines 261-272 Link Here

(-)vboxnetflt/include/iprt/types.h.ORIG (-6 / +1 lines)
261	# else	261	# else
262	typedef unsigned char bool;	262	typedef unsigned char bool;
263	# endif	263	# endif
264	# ifndef true	264	enum mybool{false=0,true=1};
265	# define true (1)
266	# endif
267	# ifndef false
268	# define false (0)
269	# endif
270	#endif	265	#endif
271		266
272	/**	267	/**

Lines 261-272 Link Here

(-)vboxdrv/include/iprt/types.h.ORIG (-6 / +1 lines)
261	# else	261	# else
262	typedef unsigned char bool;	262	typedef unsigned char bool;
263	# endif	263	# endif
264	# ifndef true	264	enum mybool{false=0,true=1};
265	# define true (1)
266	# endif
267	# ifndef false
268	# define false (0)
269	# endif
270	#endif	265	#endif
271		266
272	/**	267	/**

Lines 261-272 Link Here

(-)vboxnetadp/include/iprt/types.h.ORIG (-6 / +1 lines)
261	# else	261	# else
262	typedef unsigned char bool;	262	typedef unsigned char bool;
263	# endif	263	# endif
264	# ifndef true	264	enum mybool{false=0,true=1};
265	# define true (1)
266	# endif
267	# ifndef false
268	# define false (0)
269	# endif
270	#endif	265	#endif
271		266
272	/**	267	/**

Lines 261-272 Link Here

(-)vboxpci/include/iprt/types.h.ORIG (-6 / +1 lines)
261	# else	261	# else
262	typedef unsigned char bool;	262	typedef unsigned char bool;
263	# endif	263	# endif
264	# ifndef true	264	enum mybool{false=0,true=1};
265	# define true (1)
266	# endif
267	# ifndef false
268	# define false (0)
269	# endif
270	#endif	265	#endif
271		266
272	/**	267	/**