summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog4
-rw-r--r--ACE/apps/mkcsregdb/mkcsregdb.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f8987014b20..760122ebd10 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 13 18:59:00 UTC 2014 Steve Huston <shuston@riverace.com>
+
+ * apps/mkcsregdb/mkcsregdb.cpp: Fix data type error on Windows.
+
Sat Oct 11 20:45:03 UTC 2014 Steve Huston <shuston@riverace.com>
* apps/drwho/File_Manager.cpp: Fixed const-ness compile warning.
diff --git a/ACE/apps/mkcsregdb/mkcsregdb.cpp b/ACE/apps/mkcsregdb/mkcsregdb.cpp
index 7b3ff7fffa7..e575a401629 100644
--- a/ACE/apps/mkcsregdb/mkcsregdb.cpp
+++ b/ACE/apps/mkcsregdb/mkcsregdb.cpp
@@ -240,8 +240,8 @@ csdb_generator::init_output (const char *srcfile)
{
ACE_OS::strcpy (tempfilename_, "csdbXXXXXX");
}
- int fd = ACE_OS::mkstemp (tempfilename_);
- if (fd == -1)
+ ACE_HANDLE fd = ACE_OS::mkstemp (tempfilename_);
+ if (fd == ACE_INVALID_HANDLE)
ACE_ERROR_RETURN ((LM_ERROR,
"Unable to open output file, %p\n",
tempfilename_),