Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 627822 | Differences between
and this patch

Collapse All | Expand All

(-)work.orig/vboxdrv/include/iprt/string.h (-4 / +1 lines)
Lines 32-42 Link Here
32 
#include <iprt/stdarg.h>
 32 
#include <iprt/stdarg.h>
33 
#include <iprt/err.h> /* for VINF_SUCCESS */
 33 
#include <iprt/err.h> /* for VINF_SUCCESS */
34 
#if defined(RT_OS_LINUX) && defined(__KERNEL__)
 34 
#if defined(RT_OS_LINUX) && defined(__KERNEL__)
35 
  RT_C_DECLS_BEGIN
 35 
/* no C++ hacks ('new' etc) here anymore! */
36 
# define new newhack /* string.h: strreplace */
37 
# include <linux/string.h>
 36 
# include <linux/string.h>
38 
# undef new
39 
  RT_C_DECLS_END
40 

          37
          

        

        

          41
          
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)

          38
          
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)

        

        

          42
          
  RT_C_DECLS_BEGIN

          39
          
  RT_C_DECLS_BEGIN

        



(-)work.orig/vboxnetadp/include/iprt/string.h
      (-4 / +1 lines)




  

    
      
            Lines 32-42
          
      
      
        Link Here
      
    
  

        

          32
          
#include <iprt/stdarg.h>

          32
          
#include <iprt/stdarg.h>

        

        

          33
          
#include <iprt/err.h> /* for VINF_SUCCESS */

          33
          
#include <iprt/err.h> /* for VINF_SUCCESS */

        

        

          34
          
#if defined(RT_OS_LINUX) && defined(__KERNEL__)

          34
          
#if defined(RT_OS_LINUX) && defined(__KERNEL__)

        

          
            

              35
              
  RT_C_DECLS_BEGIN


              35
              
/* no C++ hacks ('new' etc) here anymore! */ 

            

            

              36
              
# define new newhack /* string.h: strreplace */


              
              
            

        

          37
          
# include <linux/string.h>

          36
          
# include <linux/string.h>

        

            

              38
              
# undef new

              
              
            

            

              39
              
  RT_C_DECLS_END

            

        

          40
          

          37
          

        

        

          41
          
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)

          38
          
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)

        

        

          42
          
  RT_C_DECLS_BEGIN

          39
          
  RT_C_DECLS_BEGIN

        



(-)work.orig/vboxnetflt/include/iprt/string.h
      (-4 / +1 lines)




  

    
      
            Lines 32-42
          
      
      
        Link Here
      
    
  

        

          32
          
#include <iprt/stdarg.h>

          32
          
#include <iprt/stdarg.h>

        

        

          33
          
#include <iprt/err.h> /* for VINF_SUCCESS */

          33
          
#include <iprt/err.h> /* for VINF_SUCCESS */

        

        

          34
          
#if defined(RT_OS_LINUX) && defined(__KERNEL__)

          34
          
#if defined(RT_OS_LINUX) && defined(__KERNEL__)

        

          
            

              35
              
  RT_C_DECLS_BEGIN


              35
              
/* no C++ hacks ('new' etc) here anymore! */ 

            

            

              36
              
# define new newhack /* string.h: strreplace */


              
              
            

        

          37
          
# include <linux/string.h>

          36
          
# include <linux/string.h>

        

            

              38
              
# undef new

              
              
            

            

              39
              
  RT_C_DECLS_END

            

        

          40
          

          37
          

        

        

          41
          
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)

          38
          
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)

        

        

          42
          
  RT_C_DECLS_BEGIN

          39
          
  RT_C_DECLS_BEGIN

        



(-)work.orig/vboxpci/include/iprt/string.h
      (-4 / +1 lines)




  

    
      
            Lines 32-42
          
      
      
        Link Here
      
    
  

        

          32
          
#include <iprt/stdarg.h>

          32
          
#include <iprt/stdarg.h>

        

        

          33
          
#include <iprt/err.h> /* for VINF_SUCCESS */

          33
          
#include <iprt/err.h> /* for VINF_SUCCESS */

        

        

          34
          
#if defined(RT_OS_LINUX) && defined(__KERNEL__)

          34
          
#if defined(RT_OS_LINUX) && defined(__KERNEL__)

        

          
            

              35
              
  RT_C_DECLS_BEGIN


              35
              
/* no C++ hacks ('new' etc) here anymore! */ 

            

            

              36
              
# define new newhack /* string.h: strreplace */


              
              
            

        

          37
          
# include <linux/string.h>

          36
          
# include <linux/string.h>

        

            

              38
              
# undef new

              
              
            

            

              39
              
  RT_C_DECLS_END

            

        

          40
          

          37
          

        

        

          41
          
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)

          38
          
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)

        

        

          42
          
  RT_C_DECLS_BEGIN

          39
          
  RT_C_DECLS_BEGIN

        






  

  Return to bug 627822