diff options
Diffstat (limited to 'ace/os_include/iconv.h')
| -rw-r--r-- | ace/os_include/iconv.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/ace/os_include/iconv.h b/ace/os_include/iconv.h index 19c7b98186a..afabba20cf6 100644 --- a/ace/os_include/iconv.h +++ b/ace/os_include/iconv.h @@ -2,19 +2,19 @@ //============================================================================= /** - * @file iconv.h + * @file os_iconv.h * * codeset conversion facility * * $Id$ * - * @author Don Hinton <dhinton@ieee.org> + * @author Don Hinton <dhinton@dresystems.com> * @author This code was originally in various places including ace/OS.h. */ //============================================================================= -#ifndef ACE_OS_INCLUDE_ICONV_H -#define ACE_OS_INCLUDE_ICONV_H +#ifndef ACE_OS_INCLUDE_OS_ICONV_H +#define ACE_OS_INCLUDE_OS_ICONV_H #include "ace/pre.h" @@ -24,11 +24,21 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/os_include/sys/types.h" +#include "ace/os_include/sys/types.h" #if !defined (ACE_LACKS_ICONV_H) # include /**/ <iconv.h> #endif /* !ACE_LACKS_ICONV_H */ +// Place all additions (especially function declarations) within extern "C" {} +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #include "ace/post.h" -#endif /* ACE_OS_INCLUDE_ICONV_H */ +#endif /* ACE_OS_INCLUDE_OS_ICONV_H */ |