summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-04-13 02:12:23 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-04-13 02:12:23 +0000
commitaaf7c9d3f6fb729a9591ef57d3283d35afc10f69 (patch)
treeec1b47fbbf3100d46e91c1dc74e62060b9b794e9
parent1a6ce374b17d80fccd1c72adf41bf55348c82df4 (diff)
downloadATCD-aaf7c9d3f6fb729a9591ef57d3283d35afc10f69.tar.gz
Guard the case against using ACE_HAS_MOSTLY_UNICODE_APIS without defining UNICODE.
-rw-r--r--ace/OS.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/ace/OS.h b/ace/OS.h
index 9192dc48d4e..2d86200dd58 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -22,6 +22,10 @@
// configuration file (e.g., config-sunos5-sunc++-4.x.h).
#include "ace/inc_user_config.h"
+#if defined (ACE_HAS_MOSTLY_UNICODE_APIS) && !defined (UNICODE)
+#error UNICODE must be defined when using ACE_HAS_MOSTLY_UNICODE_APIS, check your compiler document on how to enable UNICODE.
+#endif /* ACE_HAS_MOSTLY_UNICODE_APIS && !UNICODE */
+
#if defined (ACE_HAS_ANSI_CASTS)
# define ACE_static_cast(TYPE, EXPR) static_cast<TYPE> (EXPR)
# define ACE_const_cast(TYPE, EXPR) const_cast<TYPE> (EXPR)
@@ -4442,7 +4446,7 @@ public:
static char *mktemp (char *t);
static char *getcwd (char *,
size_t);
- static int rename (const char *old_name,
+ static int rename (const char *old_name,
const char *new_name);
static int unlink (const char *path);
static char *tempnam (const char *dir,