glibc-string2-pointer-arith.patch

   1 --- glibc-2.1.2/string/bits/string2.h.orig      Tue Oct 12 04:32:42 1999
   2 +++ glibc-2.1.2/string/bits/string2.h   Mon Jan 10 17:36:51 2000
   3 @@ -122,54 +122,54 @@
   4         {                                                                     \
   5         case 15:                                                                      \
   6          __u->__ui = __c * 0x01010101;                                        \
   7 -        __u = __extension__ ((void *) __u + 4);                              \
   8 +        __u = __extension__ (void *)((char *) __u + 4);                      \
   9         case 11:                                                                      \
  10          __u->__ui = __c * 0x01010101;                                        \
  11 -        __u = __extension__ ((void *) __u + 4);                              \
  12 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  13         case 7:                                                               \
  14          __u->__ui = __c * 0x01010101;                                        \
  15 -        __u = __extension__ ((void *) __u + 4);                              \
  16 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  17         case 3:                                                               \
  18          __u->__usi = (unsigned short int) __c * 0x0101;                      \
  19 -        __u = __extension__ ((void *) __u + 2);                              \
  20 +        __u = __extension__ (void *)((char *) __u + 2);                      \
  21          __u->__uc = (unsigned char) __c;                                     \
  22          break;                                                               \
  23                                                                               \
  24         case 14:                                                                      \
  25          __u->__ui = __c * 0x01010101;                                        \
  26 -        __u = __extension__ ((void *) __u + 4);                              \
  27 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  28         case 10:                                                                      \
  29          __u->__ui = __c * 0x01010101;                                        \
  30 -        __u = __extension__ ((void *) __u + 4);                              \
  31 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  32         case 6:                                                               \
  33          __u->__ui = __c * 0x01010101;                                        \
  34 -        __u = __extension__ ((void *) __u + 4);                              \
  35 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  36         case 2:                                                               \
  37          __u->__usi = (unsigned short int) __c * 0x0101;                      \
  38          break;                                                               \
  39                                                                               \
  40         case 13:                                                                      \
  41          __u->__ui = __c * 0x01010101;                                        \
  42 -        __u = __extension__ ((void *) __u + 4);                              \
  43 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  44         case 9:                                                               \
  45          __u->__ui = __c * 0x01010101;                                        \
  46 -        __u = __extension__ ((void *) __u + 4);                              \
  47 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  48         case 5:                                                               \
  49          __u->__ui = __c * 0x01010101;                                        \
  50 -        __u = __extension__ ((void *) __u + 4);                              \
  51 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  52         case 1:                                                               \
  53          __u->__uc = (unsigned char) __c;                                     \
  54          break;                                                               \
  55                                                                               \
  56         case 16:                                                                      \
  57          __u->__ui = __c * 0x01010101;                                        \
  58 -        __u = __extension__ ((void *) __u + 4);                              \
  59 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  60         case 12:                                                                      \
  61          __u->__ui = __c * 0x01010101;                                        \
  62 -        __u = __extension__ ((void *) __u + 4);                              \
  63 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  64         case 8:                                                               \
  65          __u->__ui = __c * 0x01010101;                                        \
  66 -        __u = __extension__ ((void *) __u + 4);                              \
  67 +        __u = __extension__ (void *)((char *) __u + 4);                      \
  68         case 4:                                                               \
  69          __u->__ui = __c * 0x01010101;                                        \
  70         case 0:                                                               \
  71 @@ -235,47 +235,47 @@
  72      {
  73      case 1:
  74        __u->__c = __src0_1;
  75 -      __u = __extension__ ((void *) __u + 1);
  76 +      __u = __extension__ (void *)((char *) __u + 1);
  77        break;
  78      case 2:
  79        __u->__usi = __src0_2;
  80 -      __u = __extension__ ((void *) __u + 2);
  81 +      __u = __extension__ (void *)((char *) __u + 2);
  82        break;
  83      case 3:
  84        __u->__usi = __src0_2;
  85 -      __u = __extension__ ((void *) __u + 2);
  86 +      __u = __extension__ (void *)((char *) __u + 2);
  87        __u->__c = __src2_1;
  88 -      __u = __extension__ ((void *) __u + 1);
  89 +      __u = __extension__ (void *)((char *) __u + 1);
  90        break;
  91      case 4:
  92        __u->__ui = __src0_4;
  93 -      __u = __extension__ ((void *) __u + 4);
  94 +      __u = __extension__ (void *)((char *) __u + 4);
  95        break;
  96      case 5:
  97        __u->__ui = __src0_4;
  98 -      __u = __extension__ ((void *) __u + 4);
  99 +      __u = __extension__ (void *)((char *) __u + 4);
 100        __u->__c = __src4_1;
 101 -      __u = __extension__ ((void *) __u + 1);
 102 +      __u = __extension__ (void *)((char *) __u + 1);
 103        break;
 104      case 6:
 105        __u->__ui = __src0_4;
 106 -      __u = __extension__ ((void *) __u + 4);
 107 +      __u = __extension__ (void *)((char *) __u + 4);
 108        __u->__usi = __src4_2;
 109 -      __u = __extension__ ((void *) __u + 2);
 110 +      __u = __extension__ (void *)((char *) __u + 2);
 111        break;
 112      case 7:
 113        __u->__ui = __src0_4;
 114 -      __u = __extension__ ((void *) __u + 4);
 115 +      __u = __extension__ (void *)((char *) __u + 4);
 116        __u->__usi = __src4_2;
 117 -      __u = __extension__ ((void *) __u + 2);
 118 +      __u = __extension__ (void *)((char *) __u + 2);
 119        __u->__c = __src6_1;
 120 -      __u = __extension__ ((void *) __u + 1);
 121 +      __u = __extension__ (void *)((char *) __u + 1);
 122        break;
 123      case 8:
 124        __u->__ui = __src0_4;
 125 -      __u = __extension__ ((void *) __u + 4);
 126 +      __u = __extension__ (void *)((char *) __u + 4);
 127        __u->__ui = __src4_4;
 128 -      __u = __extension__ ((void *) __u + 4);
 129 +      __u = __extension__ (void *)((char *) __u + 4);
 130        break;
 131      }
 132    return (void *) __u;
 133 @@ -360,7 +360,7 @@
 134        __extension__ __u->__sca8 = __src8;
 135        break;
 136      }
 137 -  return __extension__ ((void *) __u + __srclen);
 138 +  return __extension__ (void *)((char *) __u + __srclen);
 139  }
 140  #  endif
 141  # endif
 142 @@ -416,7 +416,7 @@
 143        break;
 144      case 3:
 145        __u->__usi = __src0_2;
 146 -      __u = __extension__ ((void *) __u + 2);
 147 +      __u = __extension__ (void *)((char *) __u + 2);
 148        __u->__uc = '\0';
 149        break;
 150      case 4:
 151 @@ -424,24 +424,24 @@
 152        break;
 153      case 5:
 154        __u->__ui = __src0_4;
 155 -      __u = __extension__ ((void *) __u + 4);
 156 +      __u = __extension__ (void *)((char *) __u + 4);
 157        __u->__uc = '\0';
 158        break;
 159      case 6:
 160        __u->__ui = __src0_4;
 161 -      __u = __extension__ ((void *) __u + 4);
 162 +      __u = __extension__ (void *)((char *) __u + 4);
 163        __u->__usi = __src4_2;
 164        break;
 165      case 7:
 166        __u->__ui = __src0_4;
 167 -      __u = __extension__ ((void *) __u + 4);
 168 +      __u = __extension__ (void *)((char *) __u + 4);
 169        __u->__usi = __src4_2;
 170 -      __u = __extension__ ((void *) __u + 2);
 171 +      __u = __extension__ (void *)((char *) __u + 2);
 172        __u->__uc = '\0';
 173        break;
 174      case 8:
 175        __u->__ui = __src0_4;
 176 -      __u = __extension__ ((void *) __u + 4);
 177 +      __u = __extension__ (void *)((char *) __u + 4);
 178        __u->__ui = __src4_4;
 179        break;
 180      }
 181 @@ -572,40 +572,40 @@
 182        break;
 183      case 2:
 184        __u->__usi = __src0_2;
 185 -      __u = __extension__ ((void *) __u + 1);
 186 +      __u = __extension__ (void *)((char *) __u + 1);
 187        break;
 188      case 3:
 189        __u->__usi = __src0_2;
 190 -      __u = __extension__ ((void *) __u + 2);
 191 +      __u = __extension__ (void *)((char *) __u + 2);
 192        __u->__uc = '\0';
 193        break;
 194      case 4:
 195        __u->__ui = __src0_4;
 196 -      __u = __extension__ ((void *) __u + 3);
 197 +      __u = __extension__ (void *)((char *) __u + 3);
 198        break;
 199      case 5:
 200        __u->__ui = __src0_4;
 201 -      __u = __extension__ ((void *) __u + 4);
 202 +      __u = __extension__ (void *)((char *) __u + 4);
 203        __u->__uc = '\0';
 204        break;
 205      case 6:
 206        __u->__ui = __src0_4;
 207 -      __u = __extension__ ((void *) __u + 4);
 208 +      __u = __extension__ (void *)((char *) __u + 4);
 209        __u->__usi = __src4_2;
 210 -      __u = __extension__ ((void *) __u + 1);
 211 +      __u = __extension__ (void *)((char *) __u + 1);
 212        break;
 213      case 7:
 214        __u->__ui = __src0_4;
 215 -      __u = __extension__ ((void *) __u + 4);
 216 +      __u = __extension__ (void *)((char *) __u + 4);
 217        __u->__usi = __src4_2;
 218 -      __u = __extension__ ((void *) __u + 2);
 219 +      __u = __extension__ (void *)((char *) __u + 2);
 220        __u->__uc = '\0';
 221        break;
 222      case 8:
 223        __u->__ui = __src0_4;
 224 -      __u = __extension__ ((void *) __u + 4);
 225 +      __u = __extension__ (void *)((char *) __u + 4);
 226        __u->__ui = __src4_4;
 227 -      __u = __extension__ ((void *) __u + 3);
 228 +      __u = __extension__ (void *)((char *) __u + 3);
 229        break;
 230      }
 231    return &__u->__uc;