- Timestamp:
- Apr 18, 2007 7:42:14 PM (18 years ago)
- Location:
- trunk/src/VBox/Additions/common/VBoxGuestLib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp
r769 r2194 28 28 #ifndef VBGL_VBOXGUEST 29 29 30 /** @todo r=bird: These two issues with string.h and bool are handled by31 * iprt/string.h and iprt/types.h respectivly. Please change after the release. */32 #if defined(__LINUX__) && defined(__KERNEL__)33 #ifndef bool /* Linux 2.6.19 C++ nightmare */34 #define bool bool_type35 #define true true_type36 #define false false_type37 #define _Bool int38 #define bool_HGCM_cpp39 #endif40 #include <linux/string.h>41 #ifdef bool_HGCM_cpp42 #undef bool43 #undef true44 #undef false45 #undef _Bool46 #undef bool_HGCM_cpp47 #endif48 #else49 #include <string.h>50 #endif51 52 30 #include <VBox/VBoxGuestLib.h> 53 31 #include "VBGLInternal.h" … … 55 33 #include <iprt/assert.h> 56 34 #include <iprt/semaphore.h> 35 #include <iprt/string.h> 57 36 58 37 #define VBGL_HGCM_ASSERTMsg AssertReleaseMsg -
trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp
r1554 r2194 24 24 #ifdef VBGL_VBOXGUEST 25 25 26 /** @todo r=bird: These two issues with string.h and bool are handled by27 * iprt/string.h and iprt/types.h respectivly. Please change after the release. */28 #if defined(__LINUX__) && defined(__KERNEL__)29 #ifndef bool /* Linux 2.6.19 C++ nightmare */30 #define bool bool_type31 #define true true_type32 #define false false_type33 #define _Bool int34 #define bool_HGCMInternal_cpp35 #endif36 #include <linux/string.h>37 #ifdef bool_HGCMInternal_cpp38 #undef bool39 #undef true40 #undef false41 #undef _Bool42 #undef bool_HGCMInternal_cpp43 #endif44 #else45 #include <string.h>46 #endif47 26 #include <VBox/VBoxGuestLib.h> 48 27 #include "VBGLInternal.h" 28 #include <iprt/string.h> 49 29 #include <iprt/assert.h> 50 30 -
trunk/src/VBox/Additions/common/VBoxGuestLib/Init.cpp
r769 r2194 21 21 */ 22 22 23 #if defined(__LINUX__) && defined(__KERNEL__)24 #ifndef bool /* Linux 2.6.19 C++ nightmare */25 #define bool bool_type26 #define true true_type27 #define false false_type28 #define _Bool int29 #define bool_Init_cpp30 #endif31 #include <linux/string.h>32 #ifdef bool_Init_cpp33 #undef bool34 #undef true35 #undef false36 #undef _Bool37 #undef bool_Init_cpp38 #endif39 #else40 #include <string.h>41 #endif42 23 43 24 #include <VBox/VBoxGuestLib.h> … … 46 27 #include "VBGLInternal.h" 47 28 29 #include <iprt/string.h> 48 30 #include <iprt/assert.h> 49 31
Note:
See TracChangeset
for help on using the changeset viewer.