summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-05-24 14:36:04 +0000
committerdhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-05-24 14:36:04 +0000
commit344dc51a67be91f30f8d6622f3649d464d31eba6 (patch)
treea0a4c84b116c9a7f7d1f571a56756206de800833
parent5b6808e9c3f08e4a1cc51de3003fcc3cee4e3f2d (diff)
downloadATCD-344dc51a67be91f30f8d6622f3649d464d31eba6.tar.gz
ChangeLogTag:Sat May 24 14:37:00 UTC 2003 Don Hinton <dhinton@dresystems.com>
-rw-r--r--ChangeLog9
-rw-r--r--ace/OS_Dirent.cpp14
2 files changed, 23 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bb1bd8a623a..020617ca644 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat May 24 14:37:00 UTC 2003 Don Hinton <dhinton@dresystems.com>
+
+ * ace/OS_Dirent.cpp:
+ Added definitions of INVALID_FILE_ATTRIBUTES and
+ INVALID_SET_FILE_POINTER if missing on ACE_WIN32. These
+ were added after VC6 shipped and are provided in subsequent
+ headers, including the SDK's. They are defined here for those
+ us who don't have the new headers.
+
Sat May 24 14:10:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Log_Msg.cpp:
diff --git a/ace/OS_Dirent.cpp b/ace/OS_Dirent.cpp
index 219699283c5..2ca31dbd278 100644
--- a/ace/OS_Dirent.cpp
+++ b/ace/OS_Dirent.cpp
@@ -6,6 +6,20 @@
#include "ace/Log_Msg.h"
#include "ace/OS.h"
+/*
+ These definitions are missing on the original VC6 distribution. The new
+ headers that define these are available in the Platform SDK and are defined
+ for those that don't have it.
+ */
+#if defined (ACE_WIN32)
+# if !defined (INVALID_FILE_ATTRIBUTES)
+# define INVALID_FILE_ATTRIBUTES (-1)
+# endif /* INVALID_FILE_ATTRIBUTES */
+# if !defined (INVALID_SET_FILE_POINTER)
+# define INVALID_SET_FILE_POINTER (-1)
+# endif /* INVALID_SET_FILE_POINTER */
+#endif /* ACE_WIN32 */
+
ACE_RCSID(ace, OS_Dirent, "$Id$")
#if !defined (ACE_HAS_INLINED_OSCALLS)