diff options
Diffstat (limited to 'ace/OS_NS_stdio.h')
| -rw-r--r-- | ace/OS_NS_stdio.h | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/ace/OS_NS_stdio.h b/ace/OS_NS_stdio.h index e1720e7f582..5ffe25db3ed 100644 --- a/ace/OS_NS_stdio.h +++ b/ace/OS_NS_stdio.h @@ -177,12 +177,7 @@ namespace ACE_OS { int fgetpos (FILE* fp, fpos_t* pos); ACE_NAMESPACE_INLINE_FUNCTION - char *fgets (char *buf, int size, FILE *fp); - -# if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FGETWS) - ACE_NAMESPACE_INLINE_FUNCTION - wchar_t *fgets (wchar_t *buf, int size, FILE *fp); -# endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */ + ACE_TCHAR *fgets (ACE_TCHAR *buf, int size, FILE *fp); //@{ @name A set of wrappers for file locks. @@ -257,7 +252,7 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION LPSECURITY_ATTRIBUTES default_win32_security_attributes (LPSECURITY_ATTRIBUTES); ACE_NAMESPACE_INLINE_FUNCTION - LPSECURITY_ATTRIBUTES default_win32_security_attributes_r (LPSECURITY_ATTRIBUTES, + LPSECURITY_ATTRIBUTES default_win32_security_attributes_r (LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES, SECURITY_DESCRIPTOR*); @@ -299,15 +294,9 @@ namespace ACE_OS { # endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION - int fputs (const char *s, + int fputs (const ACE_TCHAR *s, FILE *stream); -# if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FPUTWS) - ACE_NAMESPACE_INLINE_FUNCTION - int fputs (const wchar_t *s, - FILE *stream); -# endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */ - ACE_NAMESPACE_INLINE_FUNCTION size_t fread (void *ptr, size_t size, @@ -349,23 +338,13 @@ namespace ACE_OS { char *gets (char *str, int n = 0); ACE_NAMESPACE_INLINE_FUNCTION - void perror (const char *s); - -#if defined (ACE_HAS_WCHAR) - ACE_NAMESPACE_INLINE_FUNCTION - void perror (const wchar_t *s); -#endif /* ACE_HAS_WCHAR */ + void perror (const ACE_TCHAR *s); extern ACE_Export int printf (const char *format, ...); ACE_NAMESPACE_INLINE_FUNCTION - int puts (const char *s); - -#if defined (ACE_HAS_WCHAR) - ACE_NAMESPACE_INLINE_FUNCTION - int puts (const wchar_t *s); -#endif /* ACE_HAS_WCHAR */ + int puts (const ACE_TCHAR *s); ACE_NAMESPACE_INLINE_FUNCTION int rename (const char *old_name, |