- merged gcc4 patch and more complete no_redefine_macro patch (based on Debian patche...

[packages/Glide_V3-DRI.git] / glide-ioctl.patch

diff --git a/glide-ioctl.patch b/glide-ioctl.patch
index d89ff85985c991a31545dfffd706787240b7d189..89712ec12b4e44d2a094a91f0f2d34c98083ab42 100644 (file)
--- a/glide-ioctl.patch
+++ b/glide-ioctl.patch
@@ -5,7 +5,7 @@
      return 0;
    }
 -  if (ioctl(linuxDevFd, _IOR('3', 3, sizeof(struct pioData)), &desc)==-1)
-+  if (ioctl(linuxDevFd, _IOR('3', 3, size_t /* struct pioData */), &desc)==-1)
++  if (ioctl(linuxDevFd, _IOR('3', 3, struct pioData), &desc)==-1)
      return 0;
    switch (size) {
    case 1:
@@ -14,7 +14,7 @@
    desc.device=device;
    desc.value=&data;
 -  if (ioctl(linuxDevFd, _IOW('3', 4, sizeof(struct pioData)), &desc)==-1)
-+  if (ioctl(linuxDevFd, _IOW('3', 4, size_t /* struct pioData */), &desc)==-1)
++  if (ioctl(linuxDevFd, _IOW('3', 4, struct pioData), &desc)==-1)
      return FXFALSE;
    return FXTRUE;
  }
@@ -23,7 +23,7 @@
    desc.value=&tmp;
    /* fprintf(stderr, "Read byte desc at %x tmp at %x\n", &desc, &tmp); */
 -  ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc);
-+  ioctl(linuxDevFd, _IOR(0, 0, size_t /* struct pioData */), &desc);
++  ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc);
    /* fprintf(stderr, "Got byte %d versus %d\n", tmp, inb(port)); */
    return tmp;
  }
@@ -32,7 +32,7 @@
    desc.value=&tmp;
    /* fprintf(stderr, "Read word desc at %x tmp at %x\n", &desc, &tmp); */
 -  ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc);
-+  ioctl(linuxDevFd, _IOR(0, 0, size_t /* struct pioData */), &desc);
++  ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc);
    /* fprintf(stderr, "Got word %d versus %d\n", tmp, inw(port)); */
    return tmp;
  }
@@ -41,7 +41,7 @@
    desc.value=&tmp;
    /* fprintf(stderr, "Read long desc at %x tmp at %x\n", &desc, &tmp); */
 -  ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc);
-+  ioctl(linuxDevFd, _IOR(0, 0, size_t /* struct pioData */), &desc);
++  ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc);
    /* fprintf(stderr, "Got long %x versus %x\n", tmp, inl(port)); */
    return tmp;
  }
@@ -50,7 +50,7 @@
    desc.size=sizeof(data);
    desc.value=&data;
 -  return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1;
-+  return ioctl(linuxDevFd, _IOW(0, 1, size_t /* struct pioData */), &desc)!=-1;
++  return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
  }
  
  static FxBool 
@@ -59,7 +59,7 @@
    desc.size=sizeof(data);
    desc.value=&data;
 -  return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1;
-+  return ioctl(linuxDevFd, _IOW(0, 1, size_t /* struct pioData */), &desc)!=-1;
++  return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
  }
  
  static FxBool 
@@ -68,7 +68,7 @@
    desc.size=sizeof(data);
    desc.value=&data;
 -  return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1;
-+  return ioctl(linuxDevFd, _IOW(0, 1, size_t /* struct pioData */), &desc)!=-1;
++  return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
  }
  
  static FxBool