summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-09 05:41:03 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-09 05:41:03 +0000
commit0e5e2ce8380aa1cefb1e255bca9f385e0468a8b8 (patch)
tree7044a692266e50d06ebf6c31c616e375538c9d01
parent9342feea05ee828245cc0ed237cc16703b0273d0 (diff)
Mark void* operations as extensions.
-rw-r--r--string/bits/string2.h86
-rw-r--r--sysdeps/i386/i486/bits/string.h58
2 files changed, 72 insertions, 72 deletions
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 07f5ac3992..314cb382ed 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -122,54 +122,54 @@ __STRING2_COPY_TYPE (8);
{ \
case 15: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 11: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 7: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 3: \
__u->__usi = (unsigned short int) __c * 0x0101; \
- __u = (void *) __u + 2; \
+ __u = __extension__ ((void *) __u + 2); \
__u->__uc = (unsigned char) __c; \
break; \
\
case 14: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 10: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 6: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 2: \
__u->__usi = (unsigned short int) __c * 0x0101; \
break; \
\
case 13: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 9: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 5: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 1: \
__u->__uc = (unsigned char) __c; \
break; \
\
case 16: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 12: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 8: \
__u->__ui = __c * 0x01010101; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 4: \
__u->__ui = __c * 0x01010101; \
case 0: \
@@ -235,47 +235,47 @@ __mempcpy_small (void *__dest1,
{
case 1:
__u->__c = __src0_1;
- __u = (void *) __u + 1;
+ __u = __extension__ ((void *) __u + 1);
break;
case 2:
__u->__usi = __src0_2;
- __u = (void *) __u + 2;
+ __u = __extension__ ((void *) __u + 2);
break;
case 3:
__u->__usi = __src0_2;
- __u = (void *) __u + 2;
+ __u = __extension__ ((void *) __u + 2);
__u->__c = __src2_1;
- __u = (void *) __u + 1;
+ __u = __extension__ ((void *) __u + 1);
break;
case 4:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
break;
case 5:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__c = __src4_1;
- __u = (void *) __u + 1;
+ __u = __extension__ ((void *) __u + 1);
break;
case 6:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__usi = __src4_2;
- __u = (void *) __u + 2;
+ __u = __extension__ ((void *) __u + 2);
break;
case 7:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__usi = __src4_2;
- __u = (void *) __u + 2;
+ __u = __extension__ ((void *) __u + 2);
__u->__c = __src6_1;
- __u = (void *) __u + 1;
+ __u = __extension__ ((void *) __u + 1);
break;
case 8:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__ui = __src4_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
break;
}
return (void *) __u;
@@ -416,7 +416,7 @@ __strcpy_small (char *__dest,
break;
case 3:
__u->__usi = __src0_2;
- __u = (void *) __u + 2;
+ __u = __extension__ ((void *) __u + 2);
__u->__uc = '\0';
break;
case 4:
@@ -424,24 +424,24 @@ __strcpy_small (char *__dest,
break;
case 5:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__uc = '\0';
break;
case 6:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__usi = __src4_2;
break;
case 7:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__usi = __src4_2;
- __u = (void *) __u + 2;
+ __u = __extension__ ((void *) __u + 2);
__u->__uc = '\0';
break;
case 8:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__ui = __src4_4;
break;
}
@@ -572,40 +572,40 @@ __stpcpy_small (char *__dest,
break;
case 2:
__u->__usi = __src0_2;
- __u = (void *) __u + 1;
+ __u = __extension__ ((void *) __u + 1);
break;
case 3:
__u->__usi = __src0_2;
- __u = (void *) __u + 2;
+ __u = __extension__ ((void *) __u + 2);
__u->__uc = '\0';
break;
case 4:
__u->__ui = __src0_4;
- __u = (void *) __u + 3;
+ __u = __extension__ ((void *) __u + 3);
break;
case 5:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__uc = '\0';
break;
case 6:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__usi = __src4_2;
- __u = (void *) __u + 1;
+ __u = __extension__ ((void *) __u + 1);
break;
case 7:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__usi = __src4_2;
- __u = (void *) __u + 2;
+ __u = __extension__ ((void *) __u + 2);
__u->__uc = '\0';
break;
case 8:
__u->__ui = __src0_4;
- __u = (void *) __u + 4;
+ __u = __extension__ ((void *) __u + 4);
__u->__ui = __src4_4;
- __u = (void *) __u + 3;
+ __u = __extension__ ((void *) __u + 3);
break;
}
return &__u->__uc;
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h
index 8857a7178a..644967c895 100644
--- a/sysdeps/i386/i486/bits/string.h
+++ b/sysdeps/i386/i486/bits/string.h
@@ -230,54 +230,54 @@ memcmp (__const void *__s1, __const void *__s2, size_t __n)
{ \
case 15: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 11: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 7: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 3: \
__u->__usi = (unsigned short int) __c; \
- __u = (void *) __u + 2; \
+ __u = __extension__ ((void *) __u + 2); \
__u->__uc = (unsigned char) __c; \
break; \
\
case 14: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 10: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 6: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 2: \
__u->__usi = (unsigned short int) __c; \
break; \
\
case 13: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 9: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 5: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 1: \
__u->__uc = (unsigned char) __c; \
break; \
\
case 16: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 12: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 8: \
__u->__ui = __c; \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
case 4: \
__u->__ui = __c; \
case 0: \
@@ -529,7 +529,7 @@ __strlen_g (__const char *__str)
break; \
case 3: \
__u->__usi = __STRING_SMALL_GET16 (src, 0); \
- __u = (void *) __u + 2; \
+ __u = __extension__ ((void *) __u + 2); \
__u->__uc = '\0'; \
break; \
case 4: \
@@ -537,24 +537,24 @@ __strlen_g (__const char *__str)
break; \
case 5: \
__u->__ui = __STRING_SMALL_GET32 (src, 0); \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
__u->__uc = '\0'; \
break; \
case 6: \
__u->__ui = __STRING_SMALL_GET32 (src, 0); \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
__u->__usi = __STRING_SMALL_GET16 (src, 4); \
break; \
case 7: \
__u->__ui = __STRING_SMALL_GET32 (src, 0); \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
__u->__usi = __STRING_SMALL_GET16 (src, 4); \
- __u = (void *) __u + 2; \
+ __u = __extension__ ((void *) __u + 2); \
__u->__uc = '\0'; \
break; \
case 8: \
__u->__ui = __STRING_SMALL_GET32 (src, 0); \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
__u->__ui = __STRING_SMALL_GET32 (src, 4); \
break; \
} \
@@ -616,40 +616,40 @@ __strcpy_g (char *__dest, __const char *__src)
break; \
case 2: \
__u->__usi = __STRING_SMALL_GET16 (src, 0); \
- __u = (void *) __u + 1; \
+ __u = __extension__ ((void *) __u + 1); \
break; \
case 3: \
__u->__usi = __STRING_SMALL_GET16 (src, 0); \
- __u = (void *) __u + 2; \
+ __u = __extension__ ((void *) __u + 2); \
__u->__uc = '\0'; \
break; \
case 4: \
__u->__ui = __STRING_SMALL_GET32 (src, 0); \
- __u = (void *) __u + 3; \
+ __u = __extension__ ((void *) __u + 3); \
break; \
case 5: \
__u->__ui = __STRING_SMALL_GET32 (src, 0); \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
__u->__uc = '\0'; \
break; \
case 6: \
__u->__ui = __STRING_SMALL_GET32 (src, 0); \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
__u->__usi = __STRING_SMALL_GET16 (src, 4); \
- __u = (void *) __u + 1; \
+ __u = __extension__ ((void *) __u + 1); \
break; \
case 7: \
__u->__ui = __STRING_SMALL_GET32 (src, 0); \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
__u->__usi = __STRING_SMALL_GET16 (src, 4); \
- __u = (void *) __u + 2; \
+ __u = __extension__ ((void *) __u + 2); \
__u->__uc = '\0'; \
break; \
case 8: \
__u->__ui = __STRING_SMALL_GET32 (src, 0); \
- __u = (void *) __u + 4; \
+ __u = __extension__ ((void *) __u + 4); \
__u->__ui = __STRING_SMALL_GET32 (src, 4); \
- __u = (void *) __u + 3; \
+ __u = __extension__ ((void *) __u + 3); \
break; \
} \
(char *) __u; }))