[patch] constification.patch

constification.patch (text/plain), 2.90 KB, created by Enoid on 2011-08-16 15:45:46 UTC

diff -urp vboxdrv.orig/SUPDrvIDC.h vboxdrv/SUPDrvIDC.h
--- vboxdrv.orig/SUPDrvIDC.h   2011-07-19 13:53:53.000000000 +0300
+++ vboxdrv/SUPDrvIDC.h   2011-08-15 14:17:38.056752712 +0300
@@ -160,7 +160,7 @@ typedef struct SUPDRVIDCREQGETSYM
         {
             /** The symbol address. */
             PFNRT           pfnSymbol;
-        } Out;
+        } __no_const Out;
     } u;
 } SUPDRVIDCREQGETSYM;
 /** Pointer to a SUPDRV IDC get symbol request. */
diff -urp vboxnetflt.orig/include/VBox/intnet.h vboxnetflt/include/VBox/intnet.h
--- vboxnetflt.orig/include/VBox/intnet.h   2011-07-19 13:53:53.000000000 +0300
+++ vboxnetflt/include/VBox/intnet.h   2011-08-15 14:18:44.266752698 +0300
@@ -783,7 +783,7 @@ typedef struct INTNETTRUNKFACTORY
     DECLR0CALLBACKMEMBER(int, pfnCreateAndConnect,(struct INTNETTRUNKFACTORY *pIfFactory, const char *pszName,
                                                    PINTNETTRUNKSWPORT pSwitchPort, uint32_t fFlags,
                                                    PINTNETTRUNKIFPORT *ppIfPort));
-} INTNETTRUNKFACTORY;
+} __no_const INTNETTRUNKFACTORY;
 /** Pointer to the trunk factory. */
 typedef INTNETTRUNKFACTORY *PINTNETTRUNKFACTORY;

diff -urp vboxnetflt.orig/linux/VBoxNetFlt-linux.c vboxnetflt/linux/VBoxNetFlt-linux.c
--- vboxnetflt.orig/linux/VBoxNetFlt-linux.c   2011-07-19 13:53:53.000000000 +0300
+++ vboxnetflt/linux/VBoxNetFlt-linux.c   2011-08-15 17:32:50.096512225 +0300
@@ -839,8 +839,7 @@ typedef struct ethtool_ops OVR_OPSTYPE;
 # define OVR_XMIT pfnStartXmit

 # else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
-
-typedef struct net_device_ops OVR_OPSTYPE;
+typedef struct net_device_ops __no_const OVR_OPSTYPE;
 # define OVR_OPS  netdev_ops
 # define OVR_XMIT pOrgOps->ndo_start_xmit

diff -urp vboxpci.orig/include/VBox/rawpci.h vboxpci/include/VBox/rawpci.h
--- vboxpci.orig/include/VBox/rawpci.h   2011-07-19 13:53:53.000000000 +0300
+++ vboxpci/include/VBox/rawpci.h   2011-08-15 17:08:44.094034496 +0300
@@ -545,7 +545,7 @@ typedef struct RAWPCIFACTORY
     DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY       pFactory,
                                             PVM                  pVM,
                                             PRAWPCIPERVM         pPciData));
-} RAWPCIFACTORY;
+} RAWPCIFACTORY, __no_const RAWPCIFACTORY_NO_CONST;

 #define RAWPCIFACTORY_UUID_STR   "ea089839-4171-476f-adfb-9e7ab1cbd0fb"

diff -urp vboxpci.orig/VBoxPciInternal.h vboxpci/VBoxPciInternal.h
--- vboxpci.orig/VBoxPciInternal.h   2011-07-19 13:53:53.000000000 +0300
+++ vboxpci/VBoxPciInternal.h   2011-08-15 17:08:53.204034498 +0300
@@ -130,7 +130,7 @@ typedef struct VBOXRAWPCIGLOBALS
     PVBOXRAWPCIINS pInstanceHead;

     /** The raw PCI interface factory. */
-    RAWPCIFACTORY RawPciFactory;
+    RAWPCIFACTORY_NO_CONST RawPciFactory;
     /** The SUPDRV component factory registration. */
     SUPDRVFACTORY SupDrvFactory;
     /** The number of current factory references. */