diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-27 11:25:41 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-27 11:25:41 -0500 |
| commit | 43455e09166350b1237d2168d1b008c9f47ebaf0 (patch) | |
| tree | 42390fa1645e01c728923b9874cc61a35823cffd /sysdeps/generic | |
| parent | 6ac2f2df75d3b48ab502f0b0275b7e838e90c0b1 (diff) | |
| parent | 965a54a4eecc6cf5c53718f07290171f744c4d6c (diff) | |
| download | glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.zip glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.gz glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.bz2 | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/_G_config.h | 6 | ||||
| -rw-r--r-- | sysdeps/generic/sysdep.h | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h index 4aafe65..67b8dcd 100644 --- a/sysdeps/generic/_G_config.h +++ b/sysdeps/generic/_G_config.h @@ -84,10 +84,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__))); #define _G_VTABLE_LABEL_HAS_LENGTH 1 -#if defined __cplusplus || defined __STDC__ -# define _G_ARGS(ARGLIST) ARGLIST -#else -# define _G_ARGS(ARGLIST) () -#endif +#define _G_ARGS(ARGLIST) ARGLIST #endif /* _G_config.h */ diff --git a/sysdeps/generic/sysdep.h b/sysdeps/generic/sysdep.h index d1fec54..c844aad 100644 --- a/sysdeps/generic/sysdep.h +++ b/sysdeps/generic/sysdep.h @@ -21,11 +21,7 @@ #ifndef C_LABEL /* Define a macro we can use to construct the asm name for a C symbol. */ -# ifdef __STDC__ -# define C_LABEL(name) name##: -# else -# define C_LABEL(name) name/**/: -# endif +# define C_LABEL(name) name##: #endif |