Changeset 31847 in vbox

Timestamp:

Aug 21, 2010 8:33:07 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

65049

Message:

iprt: removed crc32.h and crc64.h, use crc.h instead.

Location:

trunk

Files:

: 2 deleted
: 22 edited

include/iprt/alloca.h (modified) (2 diffs)
include/iprt/crc32.h (deleted)
include/iprt/crc64.h (deleted)
include/iprt/runtime.h (modified) (1 diff)
src/VBox/Additions/WINNT/Graphics/Display/vrdpbmp.c (modified) (1 diff)
src/VBox/Additions/WINNT/Graphics/Display/vrdptext.c (modified) (1 diff)
src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest (modified) (1 diff)
src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (2 diffs)
src/VBox/Devices/Network/DevE1000.cpp (modified) (1 diff)
src/VBox/Devices/Network/testcase/tstIntNet-1.cpp (modified) (1 diff)
src/VBox/HostDrivers/Support/SUPDrv.c (modified) (1 diff)
src/VBox/HostDrivers/Support/freebsd/files_vboxdrv (modified) (1 diff)
src/VBox/HostDrivers/Support/linux/files_vboxdrv (modified) (1 diff)
src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (1 diff)
src/VBox/HostServices/GuestControl/gctrl.cpp (modified) (1 diff)
src/VBox/HostServices/GuestControl/testcase/tstGuestControlSvc.cpp (modified) (1 diff)
src/VBox/Runtime/common/checksum/crc32.cpp (modified) (1 diff)
src/VBox/Runtime/common/checksum/crc64.cpp (modified) (1 diff)
src/VBox/Runtime/common/misc/zip.cpp (modified) (1 diff)
src/VBox/Runtime/testcase/tstRTDigest.cpp (modified) (1 diff)
src/VBox/VMM/PGMSavedState.cpp (modified) (1 diff)
src/VBox/VMM/SSM.cpp (modified) (1 diff)
src/VBox/VMM/VMMGC/VMMGCDeps.cpp (modified) (1 diff)
src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/include/iprt/alloca.h

-              r28800
+              r31847
  */
+#ifndef __iprt_alloca_h__
+#define __iprt_alloca_h__
+#ifndef ___iprt_alloca_h
+#define ___iprt_alloca_h
+#if defined(IN_RC) || defined(IN_RING0_AGNOSTIC)
+# error "No alloca() in raw-mode and agnostic ring-0 context as it may have external dependencies like libgcc."
+#endif
 /*
 …
 /* ASSUMES GNU C */
 # define alloca(cb) __builtin_alloca(cb)
 #else
 # include <stdlib.h>

trunk/include/iprt/runtime.h

-              r28800
+              r31847
 #include <iprt/initterm.h>
 #ifndef IN_RC
 # include <iprt/alloc.h>
+#if !defined(IN_RC) && !defined(IN_RING0_AGNOSTIC)
+# include <iprt/alloca.h>
 #endif
 #include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/avl.h>
+#include <iprt/crc32.h>
+#include <iprt/crc64.h>
+#include <iprt/crc.h>
 #include <iprt/critsect.h>
 #include <iprt/dir.h>

trunk/src/VBox/Additions/WINNT/Graphics/Display/vrdpbmp.c

r28800	r31847
21	21	#include "driver.h"
22	22	#include "vrdpbmp.h"
23		#include <iprt/crc64.h>
	23	#include <iprt/crc.h>
24	24	#include <VBox/VRDPOrders.h>
25	25

trunk/src/VBox/Additions/WINNT/Graphics/Display/vrdptext.c

r28800	r31847
20	20	#include "driver.h"
21	21	#include <VBox/VRDPOrders.h>
22		#include <iprt/crc64.h>
	22	#include <iprt/crc.h>
23	23
24	24	/*

trunk/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest

r31518	r31847
55	55	${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
56	56	${PATH_ROOT}/include/iprt/crc.h=>include/iprt/crc.h \
57		~~${PATH_ROOT}/include/iprt/crc32.h=>include/iprt/crc32.h \~~
58	57	${PATH_ROOT}/include/iprt/net.h=>include/iprt/net.h \
59	58	${PATH_ROOT}/include/iprt/rand.h=>include/iprt/rand.h \

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

-              r30662
+              r31847
 /* $Id$ */
 /** @file
 …
 *******************************************************************************/
 #include <iprt/assert.h>
 #include <iprt/crc32.h>
+#include <iprt/crc.h>
 #include <iprt/ctype.h>
 #include <iprt/env.h>

trunk/src/VBox/Devices/Network/DevE1000.cpp

r31097	r31847
44	44	//#define E1K_USE_SUPLIB_SEMEVENT
45	45
46		#include <iprt/crc32.h>
	46	#include <iprt/crc.h>
47	47	#include <iprt/ctype.h>
48	48	#include <iprt/net.h>

trunk/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp

r28800	r31847
35	35	#include <iprt/rand.h>
36	36	#include <iprt/log.h>
37		#include <iprt/crc32.h>
	37	#include <iprt/crc.h>
38	38	#include <iprt/net.h>
39	39

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

r31829	r31847
48	48	#include <iprt/uuid.h>
49	49	#include <iprt/net.h>
50		#include <iprt/crc32.h>
	50	#include <iprt/crc.h>
51	51	#include <iprt/string.h>
52	52	#if defined(RT_OS_DARWIN) \|\| defined(RT_OS_SOLARIS) \|\| defined(RT_OS_FREEBSD)

trunk/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv

r31842	r31847
61	61	${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
62	62	${PATH_ROOT}/include/iprt/crc.h=>include/iprt/crc.h \
63		~~${PATH_ROOT}/include/iprt/crc32.h=>include/iprt/crc32.h \~~
64	63	${PATH_ROOT}/include/iprt/net.h=>include/iprt/net.h \
65	64	${PATH_ROOT}/include/iprt/rand.h=>include/iprt/rand.h \

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

r31840	r31847
36	36	${PATH_ROOT}/include/iprt/cpuset.h=>include/iprt/cpuset.h \
37	37	${PATH_ROOT}/include/iprt/crc.h=>include/iprt/crc.h \
38		~~${PATH_ROOT}/include/iprt/crc32.h=>include/iprt/crc32.h \~~
39	38	${PATH_ROOT}/include/iprt/ctype.h=>include/iprt/ctype.h \
40	39	${PATH_ROOT}/include/iprt/err.h=>include/iprt/err.h \

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

r31078	r31847
32	32	#include <iprt/thread.h>
33	33	#include <iprt/spinlock.h>
34		#include <iprt/crc32.h>
	34	#include <iprt/crc.h>
35	35	#include <iprt/err.h>
36	36	#include <iprt/ctype.h>

trunk/src/VBox/HostServices/GuestControl/gctrl.cpp

r28800	r31847
30	30	#include <iprt/alloca.h>
31	31	#include <iprt/initterm.h>
32		#include <iprt/crc32.h>
	32	#include <iprt/crc.h>
33	33	#include <iprt/ctype.h>
34	34	#include <iprt/env.h>

trunk/src/VBox/HostServices/GuestControl/testcase/tstGuestControlSvc.cpp

r28800	r31847
23	23	#include <iprt/alloca.h>
24	24	#include <iprt/initterm.h>
25		#include <iprt/crc32.h>
	25	#include <iprt/crc.h>
26	26	#include <iprt/ctype.h>
27	27	#include <iprt/env.h>

trunk/src/VBox/Runtime/common/checksum/crc32.cpp

r28800	r31847
75	75	#include <sys/systm.h>
76	76	#else
77		# include <iprt/crc32.h>
	77	# include <iprt/crc.h>
78	78	# include "internal/iprt.h"
79	79	#endif

trunk/src/VBox/Runtime/common/checksum/crc64.cpp

r28800	r31847
34	34	* Header Files *
35	35	*******************************************************************************/
36		#include <iprt/crc64.h>
	36	#include <iprt/crc.h>
37	37	#include "internal/iprt.h"
38	38

trunk/src/VBox/Runtime/common/misc/zip.cpp

r28800	r31847
51	51	#ifdef RTZIP_USE_LZF
52	52	# include <lzf.h>
53		# include <iprt/crc32.h>
	53	# include <iprt/crc.h>
54	54	#endif
55	55	#ifdef RTZIP_USE_LZJB

trunk/src/VBox/Runtime/testcase/tstRTDigest.cpp

-              r29906
+              r31847
 #include <iprt/sha.h>
 #include <iprt/md5.h>
+#include <iprt/crc32.h>
+#include <iprt/crc64.h>
+#include <iprt/crc.h>
 #include <iprt/ctype.h>

trunk/src/VBox/VMM/PGMSavedState.cpp

r31080	r31847
35	35	#include <iprt/asm.h>
36	36	#include <iprt/assert.h>
37		#include <iprt/crc32.h>
	37	#include <iprt/crc.h>
38	38	#include <iprt/mem.h>
39	39	#include <iprt/sha.h>

trunk/src/VBox/VMM/SSM.cpp

r30396	r31847
156	156	#include <iprt/asm.h>
157	157	#include <iprt/assert.h>
158		#include <iprt/crc32.h>
	158	#include <iprt/crc.h>
159	159	#include <iprt/file.h>
160	160	#include <iprt/mem.h>

trunk/src/VBox/VMM/VMMGC/VMMGCDeps.cpp

-              r28800
+              r31847
  */
+#include <iprt/crc.h>
 #include <iprt/string.h>
-#include <iprt/crc32.h>
 PFNRT g_VMMGCDeps[] =

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

r31407	r31847
42	42	#include <iprt/asm-amd64-x86.h>
43	43	#include <iprt/assert.h>
44		#include <iprt/crc32.h>
	44	#include <iprt/crc.h>
45	45	#include <iprt/mp.h>
46	46	#include <iprt/once.h>

Note: See TracChangeset for help on using the changeset viewer.

Changeset 31847 in vbox

Legend:

Download in other formats: