Changeset 32168 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 1, 2010 6:49:26 AM (14 years ago)

Author:

vboxsync

Message:

X11 Additions: warnings

Location:

trunk/src/VBox/Additions/x11

Files:

• vboxvideo/undefined_13 (modified) (1 diff)
• vboxvideo/vboxvideo_dri.c (modified) (4 diffs)
• x11include/xorg-server-1.9.0/edid.h (modified) (2 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/undefined_13

@@ -22 +22 @@
 XNFcalloc
 XNFstrdup
-Xalloc
-Xcalloc
-Xfree
 _Jv_RegisterClasses
 ___errno

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c

@@ -84 +84 @@
     int cConfigs = 2;  /* With and without double buffering */
     __GLXvisualConfig *pConfigs = NULL;
-    pConfigs = (__GLXvisualConfig*) xcalloc(sizeof(__GLXvisualConfig),
-                                            cConfigs);
+    pConfigs = (__GLXvisualConfig*) calloc(sizeof(__GLXvisualConfig),
+                                           cConfigs);
     if (!pConfigs)
     {
@@ -133 +133 @@
     }
     if (!rc && pConfigs)
-        xfree(pConfigs);
+        free(pConfigs);
     TRACE_LOG("returning %s\n", BOOL_STR(rc));
     return rc;
@@ -244 +244 @@
         pDRIInfo->busIdString = DRICreatePCIBusID(pVBox->pciInfo);
 #else
-        pDRIInfo->busIdString = xalloc(64);
+        pDRIInfo->busIdString = alloc(64);
         sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
             ((pciConfigPtr)pVBox->pciInfo->thisCard)->busnum,
@@ -326 +326 @@
     pVBox->pDRIInfo=0;
     if (pVBox->pVisualConfigs)
-        xfree(pVBox->pVisualConfigs);
+        free(pVBox->pVisualConfigs);
     pVBox->cVisualConfigs = 0;
     pVBox->pVisualConfigs = NULL;

trunk/src/VBox/Additions/x11/x11include/xorg-server-1.9.0/edid.h

@@ -603 +603 @@
 
 struct cea_vendor_block_hdmi {
-  Uchar  portB:4;
-  Uchar  portA:4;
-  Uchar  portD:4;
-  Uchar  portC:4;
+  __extension__ Uchar portB:4;
+  __extension__ Uchar portA:4;
+  __extension__ Uchar portD:4;
+  __extension__ Uchar portC:4;
   Uchar  support_flags;
   Uchar  max_tmds_clock;
@@ -621 +621 @@
       struct cea_vendor_block_hdmi hdmi;
       /* any other vendor blocks we know about */
-  };
+  } dummy;
 };
 
 struct cea_speaker_block
 {
-  Uchar FLR:1;
-  Uchar LFE:1;
-  Uchar FC:1;
-  Uchar RLR:1;
-  Uchar RC:1;
-  Uchar FLRC:1;
-  Uchar RLRC:1;
-  Uchar FLRW:1;
-  Uchar FLRH:1;
-  Uchar TC:1;
-  Uchar FCH:1;
-  Uchar Resv:5;
-  Uchar ResvByte;
+  __extension__ Uchar FLR:1;
+  __extension__ Uchar LFE:1;
+  __extension__ Uchar FC:1;
+  __extension__ Uchar RLR:1;
+  __extension__ Uchar RC:1;
+  __extension__ Uchar FLRC:1;
+  __extension__ Uchar RLRC:1;
+  __extension__ Uchar FLRW:1;
+  __extension__ Uchar FLRH:1;
+  __extension__ Uchar TC:1;
+  __extension__ Uchar FCH:1;
+  __extension__ Uchar Resv:5;
+  __extension__ Uchar ResvByte;
 };
 
 struct cea_data_block {
-  Uchar len:5;
-  Uchar tag:3;
+  __extension__ Uchar len:5;
+  __extension__ Uchar tag:3;
   union{
     struct cea_video_block video;