diff options
author | Bruce Korb <bkorb@gnu.org> | 2007-02-04 15:10:08 +0000 |
---|---|---|
committer | Bruce Korb <korbb@gcc.gnu.org> | 2007-02-04 15:10:08 +0000 |
commit | 5c4f0f47935386fd60e70deb452bb4422480d22f (patch) | |
tree | a18934f40a1a5e5d22c71dcc032259e1fa97a37b /fixincludes/inclhack.def | |
parent | f1bd2543dbb95d13b56ff8fc27c6a88842abe422 (diff) | |
download | gcc-5c4f0f47935386fd60e70deb452bb4422480d22f.zip gcc-5c4f0f47935386fd60e70deb452bb4422480d22f.tar.gz gcc-5c4f0f47935386fd60e70deb452bb4422480d22f.tar.bz2 |
replace "extern" only if surrounded by space characters.
From-SVN: r121574
Diffstat (limited to 'fixincludes/inclhack.def')
-rw-r--r-- | fixincludes/inclhack.def | 73 |
1 files changed, 42 insertions, 31 deletions
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 242f5af..24dc087 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -654,7 +654,8 @@ fix = { */ fix = { hackname = alpha___extern_prefix; - select = "(.*)(defined\\(__DECC\\)|def[ \t]*__DECC)[ \t]*\n(#[ \t]*pragma[ \t]*extern_prefix.*)"; + select = "(.*)(defined\\(__DECC\\)|def[ \t]*__DECC)[ \t]*\n" + "(#[ \t]*pragma[ \t]*extern_prefix.*)"; mach = "alpha*-dec-osf*"; c_fix = format; @@ -681,7 +682,8 @@ fix = { c_fix = format; c_fix_arg = "%0 && !defined(__PRAGMA_EXTERN_PREFIX)"; - test_text = "#if (_ISO_C_SOURCE>=19990L) && !defined(_LIBC_POLLUTION_H_) && !defined(__DECC)"; + test_text = "#if (_ISO_C_SOURCE>=19990L) " + "&& !defined(_LIBC_POLLUTION_H_) && !defined(__DECC)"; }; @@ -714,7 +716,8 @@ fix = { select = '(#define assert\(EX\).*)\(\(int\) \(EX\)\)'; c_fix = format; c_fix_arg = "%1(EX)"; - test_text = '#define assert(EX) (((int) (EX)) ? (void)0 : __assert(#EX, __FILE__, __LINE__))'; + test_text = '#define assert(EX) (((int) (EX)) ? (void)0 ' + ': __assert(#EX, __FILE__, __LINE__))'; }; @@ -782,14 +785,17 @@ fix = { fix = { hackname = alpha_pthread; files = pthread.h; - select = "((#[ \t]*if)([ \t]*defined[ \t]*\\(_PTHREAD_ENV_DECC\\)|def _PTHREAD_ENV_DECC)(.*))\n" + select = "((#[ \t]*if)([ \t]*defined[ \t]*\\(_PTHREAD_ENV_DECC\\)" + "|def _PTHREAD_ENV_DECC)(.*))\n" "(#[ \t]*define _PTHREAD_USE_PTDNAM_)"; mach = "alpha*-dec-osf*"; c_fix = format; - c_fix_arg = "%2 defined (_PTHREAD_ENV_DECC)%4 || defined (__PRAGMA_EXTERN_PREFIX)\n%5"; + c_fix_arg = "%2 defined (_PTHREAD_ENV_DECC)%4 " + "|| defined (__PRAGMA_EXTERN_PREFIX)\n%5"; - test_text = "# if defined (_PTHREAD_ENV_DECC) || defined (_PTHREAD_ENV_EPCC)\n" + test_text = "# if defined (_PTHREAD_ENV_DECC) " + "|| defined (_PTHREAD_ENV_EPCC)\n" "# define _PTHREAD_USE_PTDNAM_\n" "# endif\n" "# ifdef _PTHREAD_ENV_DECC\n" @@ -887,8 +893,12 @@ fix = { mach = "alpha*-dec-osf4*"; select = "#define wcstok wcstok_r"; - sed = "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@"; - sed = "s@#define wcsftime __wcsftime_isoc@extern size_t wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@"; + sed = "s@#define wcstok wcstok_r@" + "extern wchar_t *wcstok __((wchar_t *, const wchar_t *, " + "wchar_t **)) __asm__(\"wcstok_r\");@"; + sed = "s@#define wcsftime __wcsftime_isoc@" + "extern size_t wcsftime __((wchar_t *, size_t, const wchar_t *" + ", const struct tm *)) __asm__(\"__wcsftime_isoc\");@"; test_text = "#define wcstok wcstok_r\n" "#define wcsftime __wcsftime_isoc"; }; @@ -1320,21 +1330,21 @@ fix = { hackname = glibc_c99_inline_2; files = sys/stat.h, '*/sys/stat.h'; select = "extern __inline__ int"; - sed = "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/" - "#if __STDC_VERSION__ < 199901L\\\nextern\\\n#endif\\\n" - "__inline__ int \\1/"; - sed = "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/" - "#if __STDC_VERSION__ < 199901L\\\nextern\\\n#endif\\\n" - "__inline__ int __REDIRECT\\1 (\\2/"; - sed = "s/^extern __inline__ int/" - "#if __STDC_VERSION__ < 199901L\\\nextern\\\n#endif\\\n" - "__inline__ int/"; + sed = "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/" + "#if __STDC_VERSION__ < 199901L\\\nextern\\\n#endif\\\n" + "__inline__ int \\1/"; + sed = "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/" + "#if __STDC_VERSION__ < 199901L\\\nextern\\\n#endif\\\n" + "__inline__ int __REDIRECT\\1 (\\2/"; + sed = "s/^extern __inline__ int/" + "#if __STDC_VERSION__ < 199901L\\\nextern\\\n#endif\\\n" + "__inline__ int/"; test_text = <<-EOT -extern int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2)); -extern __inline__ int -__NTH (fstat64 (int __fd, struct stat64 *__statbuf)) -{} -EOT; + extern int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2)); + extern __inline__ int + __NTH (fstat64 (int __fd, struct stat64 *__statbuf)) + {} + EOT; }; @@ -1346,12 +1356,12 @@ fix = { c_fix_arg = "# if defined(__cplusplus) || __STDC_VERSION__ >= 19901L"; c_fix_arg = "^# ifdef __cplusplus$"; test_text = <<-EOT -# ifdef __cplusplus -# define __STRING_INLINE inline -# else -# define __STRING_INLINE extern __inline -# endif -EOT; + # ifdef __cplusplus + # define __STRING_INLINE inline + # else + # define __STRING_INLINE extern __inline + # endif + EOT; }; @@ -1359,12 +1369,13 @@ fix = { hackname = glibc_c99_inline_4; files = sys/sysmacros.h, '*/sys/sysmacros.h'; bypass = "__STDC_VERSION__"; + select = ' extern '; c_fix = format; c_fix_arg = "\n#if __STDC_VERSION__ < 19901L\nextern\n#endif\n"; - c_fix_arg = "extern"; test_text = <<-EOT -__extension__ extern __inline unsigned int -EOT; + __extension__ extern __inline unsigned int + __extension__ __extern_inline unsigned int + EOT; }; |