- correct fix

Changed files:
    glibc-string2-pointer-arith.patch -> 1.2

diff --git a/glibc-string2-pointer-arith.patch b/glibc-string2-pointer-arith.patch
index d201000a523ee3f304b9795e4e5e7749e1c1f512..2b5e59a2c4566c880c6f2a8b62b5d0610cd456d8 100644 (file)
--- a/glibc-string2-pointer-arith.patch
+++ b/glibc-string2-pointer-arith.patch
@@ -1,38 +1,38 @@
---- glibc-2.1.2/string/bits/string2.h  Tue Sep 28 05:53:52 1999
-+++ glibc-2.1.2/string/bits/string2.h  Fri Oct  1 20:22:35 1999
+--- glibc-2.1.2/string/bits/string2.h.orig     Tue Oct 12 04:32:42 1999
++++ glibc-2.1.2/string/bits/string2.h  Mon Jan 10 17:36:51 2000
 @@ -122,54 +122,54 @@
         {                                                                    \
         case 15:                                                                     \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 11:                                                                     \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 7:                                                                      \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 3:                                                                      \
         __u->__usi = (unsigned short int) __c * 0x0101;                      \
 -       __u = __extension__ ((void *) __u + 2);                              \
-+       __u = (void *) ((__uint8_t *) __u + 2);                              \
++       __u = __extension__ (void *)((char *) __u + 2);                      \
         __u->__uc = (unsigned char) __c;                                     \
         break;                                                               \
                                                                              \
         case 14:                                                                     \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 10:                                                                     \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 6:                                                                      \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 2:                                                                      \
         __u->__usi = (unsigned short int) __c * 0x0101;                      \
         break;                                                               \
@@ -40,15 +40,15 @@
         case 13:                                                                     \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 9:                                                                      \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 5:                                                                      \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 1:                                                                      \
         __u->__uc = (unsigned char) __c;                                     \
         break;                                                               \
@@ -56,15 +56,15 @@
         case 16:                                                                     \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 12:                                                                     \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 8:                                                                      \
         __u->__ui = __c * 0x01010101;                                        \
 -       __u = __extension__ ((void *) __u + 4);                              \
-+       __u = (void *) ((__uint8_t *) __u + 4);                              \
++       __u = __extension__ (void *)((char *) __u + 4);                      \
         case 4:                                                                      \
         __u->__ui = __c * 0x01010101;                                        \
         case 0:                                                                      \
@@ -73,60 +73,60 @@
      case 1:
        __u->__c = __src0_1;
 -      __u = __extension__ ((void *) __u + 1);
-+      __u = (void *) ((__uint8_t *) __u + 1);
++      __u = __extension__ (void *)((char *) __u + 1);
        break;
      case 2:
        __u->__usi = __src0_2;
 -      __u = __extension__ ((void *) __u + 2);
-+      __u = (void *) ((__uint8_t *) __u + 2);
++      __u = __extension__ (void *)((char *) __u + 2);
        break;
      case 3:
        __u->__usi = __src0_2;
 -      __u = __extension__ ((void *) __u + 2);
-+      __u = (void *) ((__uint8_t *) __u + 2);
++      __u = __extension__ (void *)((char *) __u + 2);
        __u->__c = __src2_1;
 -      __u = __extension__ ((void *) __u + 1);
-+      __u = (void *) ((__uint8_t *) __u + 1);
++      __u = __extension__ (void *)((char *) __u + 1);
        break;
      case 4:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        break;
      case 5:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__c = __src4_1;
 -      __u = __extension__ ((void *) __u + 1);
-+      __u = (void *) ((__uint8_t *) __u + 1);
++      __u = __extension__ (void *)((char *) __u + 1);
        break;
      case 6:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__usi = __src4_2;
 -      __u = __extension__ ((void *) __u + 2);
-+      __u = (void *) ((__uint8_t *) __u + 2);
++      __u = __extension__ (void *)((char *) __u + 2);
        break;
      case 7:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__usi = __src4_2;
 -      __u = __extension__ ((void *) __u + 2);
-+      __u = (void *) ((__uint8_t *) __u + 2);
++      __u = __extension__ (void *)((char *) __u + 2);
        __u->__c = __src6_1;
 -      __u = __extension__ ((void *) __u + 1);
-+      __u = (void *) ((__uint8_t *) __u + 1);
++      __u = __extension__ (void *)((char *) __u + 1);
        break;
      case 8:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__ui = __src4_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        break;
      }
    return (void *) __u;
@@ -135,7 +135,7 @@
        break;
      }
 -  return __extension__ ((void *) __u + __srclen);
-+  return (void *) ((__uint8_t *) __u + __srclen);
++  return __extension__ (void *)((char *) __u + __srclen);
  }
  #  endif
  # endif
@@ -144,7 +144,7 @@
      case 3:
        __u->__usi = __src0_2;
 -      __u = __extension__ ((void *) __u + 2);
-+      __u = (void *) ((__uint8_t *) __u + 2);
++      __u = __extension__ (void *)((char *) __u + 2);
        __u->__uc = '\0';
        break;
      case 4:
@@ -153,28 +153,28 @@
      case 5:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__uc = '\0';
        break;
      case 6:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__usi = __src4_2;
        break;
      case 7:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__usi = __src4_2;
 -      __u = __extension__ ((void *) __u + 2);
-+      __u = (void *) ((__uint8_t *) __u + 2);
++      __u = __extension__ (void *)((char *) __u + 2);
        __u->__uc = '\0';
        break;
      case 8:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__ui = __src4_4;
        break;
      }
@@ -183,49 +183,49 @@
      case 2:
        __u->__usi = __src0_2;
 -      __u = __extension__ ((void *) __u + 1);
-+      __u = (void *) ((__uint8_t *) __u + 1);
++      __u = __extension__ (void *)((char *) __u + 1);
        break;
      case 3:
        __u->__usi = __src0_2;
 -      __u = __extension__ ((void *) __u + 2);
-+      __u = (void *) ((__uint8_t *) __u + 2);
++      __u = __extension__ (void *)((char *) __u + 2);
        __u->__uc = '\0';
        break;
      case 4:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 3);
-+      __u = (void *) ((__uint8_t *) __u + 3);
++      __u = __extension__ (void *)((char *) __u + 3);
        break;
      case 5:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__uc = '\0';
        break;
      case 6:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__usi = __src4_2;
 -      __u = __extension__ ((void *) __u + 1);
-+      __u = (void *) ((__uint8_t *) __u + 1);
++      __u = __extension__ (void *)((char *) __u + 1);
        break;
      case 7:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__usi = __src4_2;
 -      __u = __extension__ ((void *) __u + 2);
-+      __u = (void *) ((__uint8_t *) __u + 2);
++      __u = __extension__ (void *)((char *) __u + 2);
        __u->__uc = '\0';
        break;
      case 8:
        __u->__ui = __src0_4;
 -      __u = __extension__ ((void *) __u + 4);
-+      __u = (void *) ((__uint8_t *) __u + 4);
++      __u = __extension__ (void *)((char *) __u + 4);
        __u->__ui = __src4_4;
 -      __u = __extension__ ((void *) __u + 3);
-+      __u = (void *) ((__uint8_t *) __u + 3);
++      __u = __extension__ (void *)((char *) __u + 3);
        break;
      }
    return &__u->__uc;