X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libstdc%2B%2B-v3%2Finclude%2Fc_std%2Fstd_cstdio.h;h=57bbb3ddb97270e3ab7cf1c47001b360671124f2;hp=732da5f9461b78fec6b14f32d5c2263939d2eb95;hb=c586733cf4a83b317b94681d368cd3231021ab7e;hpb=5a64d8cf37253f8227d179a52a0c022a927db8b6;ds=sidebyside diff --git a/libstdc++-v3/include/c_std/std_cstdio.h b/libstdc++-v3/include/c_std/std_cstdio.h index 732da5f9461..57bbb3ddb97 100644 --- a/libstdc++-v3/include/c_std/std_cstdio.h +++ b/libstdc++-v3/include/c_std/std_cstdio.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTDIO -#define _CSTDIO 1 +#ifndef _GLIBCXX_CSTDIO +#define _GLIBCXX_CSTDIO 1 #pragma GCC system_header @@ -94,7 +94,7 @@ #undef vprintf #undef vsprintf -namespace std +namespace std { using ::FILE; using ::fpos_t; @@ -154,15 +154,16 @@ namespace __gnu_cxx { #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC extern "C" int - (snprintf)(char * restrict, size_t, const char * restrict, ...); + (snprintf)(char * restrict, size_t, const char * restrict, ...); extern "C" int - (vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list); + (vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list); extern "C" int (vscanf)(const char * restrict, __gnuc_va_list); extern "C" int - (vsnprintf)(char * restrict, size_t, const char * restrict, __gnuc_va_list); + (vsnprintf)(char * restrict, size_t, const char * restrict, __gnuc_va_list); extern "C" int - (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list); + (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list); #endif + #if !_GLIBCXX_USE_C99_DYNAMIC using ::snprintf; using ::vfscanf; @@ -180,6 +181,6 @@ namespace std using __gnu_cxx::vsnprintf; using __gnu_cxx::vsscanf; } -#endif +#endif #endif