Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -4,7 +4,9 @@
/**
* @file OS_NS_stdio.h
*
* @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
* $Id: OS_NS_stdio.h 97921 2014-10-10 21:58:31Z shuston $
*
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
* @author Jesper S. M|ller<stophph@diku.dk>
* @author and a cast of thousands...
*
@ -47,6 +49,7 @@
* as macros on some platforms. This way macro definitions will
* be usable later as there is no way to save the macro definition
* using the pre-processor.
*
*/
inline void ace_clearerr_helper (FILE *stream)
{
@ -68,7 +71,6 @@ inline int ace_fgetc_helper (FILE *fp)
#endif /* defined (fgetc) */
}
#if !defined (ACE_LACKS_FPUTC)
inline int ace_fputc_helper (int ch, FILE *fp)
{
#if defined (fputc)
@ -78,9 +80,7 @@ inline int ace_fputc_helper (int ch, FILE *fp)
return ACE_STD_NAMESPACE::fputc (ch, fp);
#endif /* defined (fputc) */
}
#endif /* !ACE_LACKS_FPUTC */
#if !defined (ACE_LACKS_GETC)
inline int ace_getc_helper (FILE *fp)
{
#if defined (getc)
@ -90,25 +90,17 @@ inline int ace_getc_helper (FILE *fp)
return ACE_STD_NAMESPACE::getc (fp);
#endif /* defined (getc) */
}
#elif defined getc
# undef getc
#endif /* !ACE_LACKS_GETC */
inline int ace_putc_helper (int ch, FILE *fp)
{
#if defined (putc)
return putc (ch, fp);
#undef putc
#elif !defined (ACE_LACKS_PUTC)
return ACE_STD_NAMESPACE::putc (ch, fp);
#else
ACE_UNUSED_ARG (ch);
ACE_UNUSED_ARG (fp);
return -1;
return ACE_STD_NAMESPACE::putc (ch, fp);
#endif /* defined (putc) */
}
#if !defined (ACE_LACKS_UNGETC)
inline int ace_ungetc_helper (int ch, FILE *fp)
{
#if defined (ungetc)
@ -118,7 +110,6 @@ inline int ace_ungetc_helper (int ch, FILE *fp)
return ACE_STD_NAMESPACE::ungetc (ch, fp);
#endif /* defined (ungetc) */
}
#endif /* !ACE_LACKS_UNGETC */
#if !defined ACE_FILENO_EQUIVALENT
inline ACE_HANDLE ace_fileno_helper (FILE *fp)
@ -381,13 +372,9 @@ namespace ACE_OS {
#endif /* ACE_WIN32 */
#ifdef ACE_STDIO_USE_STDLIB_FOR_VARARGS
using ::fprintf;
#else
extern ACE_Export
int fprintf (FILE *fp, const char *format, ...)
ACE_GCC_FORMAT_ATTRIBUTE (printf, 2, 3);
#endif
# if defined (ACE_HAS_WCHAR)
extern ACE_Export
@ -452,13 +439,9 @@ namespace ACE_OS {
void perror (const wchar_t *s);
#endif /* ACE_HAS_WCHAR */
#if defined ACE_FACE_DEV && defined ACE_STDIO_USE_STDLIB_FOR_VARARGS
using ::printf;
#else
extern ACE_Export
int printf (const char *format, ...)
ACE_GCC_FORMAT_ATTRIBUTE (printf, 1, 2);
#endif
#if defined (ACE_HAS_WCHAR)
extern ACE_Export
@ -488,13 +471,9 @@ namespace ACE_OS {
ACE_NAMESPACE_INLINE_FUNCTION
void rewind (FILE *fp);
#if defined ACE_STDIO_USE_STDLIB_FOR_VARARGS && !defined ACE_LACKS_SNPRINTF
using ::snprintf;
#else
extern ACE_Export
int snprintf (char *buf, size_t maxlen, const char *format, ...)
ACE_GCC_FORMAT_ATTRIBUTE (printf, 3, 4);
#endif
# if defined (ACE_HAS_WCHAR)
extern ACE_Export
@ -542,7 +521,7 @@ namespace ACE_OS {
int vsnprintf (char *buffer, size_t maxlen, const char *format, va_list argptr)
ACE_GCC_FORMAT_ATTRIBUTE (printf, 3, 0);
#if defined (ACE_HAS_WCHAR)
# if defined (ACE_HAS_WCHAR)
ACE_NAMESPACE_INLINE_FUNCTION
int vasprintf (wchar_t **bufp, const wchar_t *format, va_list argptr);
@ -557,24 +536,19 @@ namespace ACE_OS {
ACE_NAMESPACE_INLINE_FUNCTION
int vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_list argptr);
#endif /* ACE_HAS_WCHAR */
# endif /* ACE_HAS_WCHAR */
#if defined (ACE_HAS_VSNPRINTF_EMULATION)
extern ACE_Export
int vsnprintf_emulation (char *buf, size_t max, const char *fmt, va_list ap);
#endif
#if !defined (ACE_HAS_VASPRINTF) && !defined (ACE_LACKS_VA_COPY)
#if !defined (ACE_HAS_VASPRINTF)
extern ACE_Export
int vasprintf_emulation (char **bufp, const char *format, va_list argptr);
#endif
#endif /* !ACE_HAS_VASPRINTF */
#if !defined (ACE_HAS_VASWPRINTF) && !defined (ACE_LACKS_VA_COPY)
#if defined (ACE_HAS_WCHAR)
#if !defined (ACE_HAS_VASWPRINTF)
extern ACE_Export
int vaswprintf_emulation (wchar_t **bufp, const wchar_t *format, va_list argptr);
#endif /* ACE_HAS_WCHAR */
#endif /* !ACE_HAS_VASWPRINTF */
#endif /* ACE_HAS_WCHAR */
} /* namespace ACE_OS */