summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog19
-rw-r--r--ChangeLogs/ChangeLog-02a19
-rw-r--r--ChangeLogs/ChangeLog-03a19
-rw-r--r--ace/Process_Semaphore.h2
-rw-r--r--ace/WFMO_Reactor.h3
-rw-r--r--ace/ace_dll.dsp108
-rw-r--r--ace/ace_lib.dsp108
7 files changed, 267 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index bb17994c6d2..89672cf8db5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,22 @@
+Wed Sep 20 12:57:52 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * ace/ace_dll.dsp:
+ * ace/ace_lib.dsp:
+ Add new files to the MSVC projects
+
+ * ace/Process_Mutex.h:
+ Under Win32 must include "ace/Synch.h"
+
+ * ace/WFMO_Reactor.h:
+ Must include "ace/Process_Mutex.h" when
+ ACE_ONLY_LATEST_AND_GREATEST is defined.
+
Wed Sep 20 12:10:41 2000 Ossama Othman <ossama@uci.edu>
- * ace/Basic_Types.h:
+ * ace/Basic_Types.h:
- Made inclusion of <sys/types.h> conditional on definition of
- ACE_LACKS_SYS_TYPES_H macro.
+ Made inclusion of <sys/types.h> conditional on definition of
+ ACE_LACKS_SYS_TYPES_H macro.
Wed Sep 20 12:00:42 2000 Carlos O'Ryan <coryan@uci.edu>
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index bb17994c6d2..89672cf8db5 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,9 +1,22 @@
+Wed Sep 20 12:57:52 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * ace/ace_dll.dsp:
+ * ace/ace_lib.dsp:
+ Add new files to the MSVC projects
+
+ * ace/Process_Mutex.h:
+ Under Win32 must include "ace/Synch.h"
+
+ * ace/WFMO_Reactor.h:
+ Must include "ace/Process_Mutex.h" when
+ ACE_ONLY_LATEST_AND_GREATEST is defined.
+
Wed Sep 20 12:10:41 2000 Ossama Othman <ossama@uci.edu>
- * ace/Basic_Types.h:
+ * ace/Basic_Types.h:
- Made inclusion of <sys/types.h> conditional on definition of
- ACE_LACKS_SYS_TYPES_H macro.
+ Made inclusion of <sys/types.h> conditional on definition of
+ ACE_LACKS_SYS_TYPES_H macro.
Wed Sep 20 12:00:42 2000 Carlos O'Ryan <coryan@uci.edu>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index bb17994c6d2..89672cf8db5 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,9 +1,22 @@
+Wed Sep 20 12:57:52 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * ace/ace_dll.dsp:
+ * ace/ace_lib.dsp:
+ Add new files to the MSVC projects
+
+ * ace/Process_Mutex.h:
+ Under Win32 must include "ace/Synch.h"
+
+ * ace/WFMO_Reactor.h:
+ Must include "ace/Process_Mutex.h" when
+ ACE_ONLY_LATEST_AND_GREATEST is defined.
+
Wed Sep 20 12:10:41 2000 Ossama Othman <ossama@uci.edu>
- * ace/Basic_Types.h:
+ * ace/Basic_Types.h:
- Made inclusion of <sys/types.h> conditional on definition of
- ACE_LACKS_SYS_TYPES_H macro.
+ Made inclusion of <sys/types.h> conditional on definition of
+ ACE_LACKS_SYS_TYPES_H macro.
Wed Sep 20 12:00:42 2000 Carlos O'Ryan <coryan@uci.edu>
diff --git a/ace/Process_Semaphore.h b/ace/Process_Semaphore.h
index 95a7c07a0f3..d33107dfa1e 100644
--- a/ace/Process_Semaphore.h
+++ b/ace/Process_Semaphore.h
@@ -22,7 +22,7 @@
#define ACE_PROCESS_SEMAPHORE_H
#include "ace/pre.h"
-#include "ace/config-all.h"
+#include "ace/Synch.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index 38024a19dec..b22016fec60 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -29,6 +29,7 @@
#include "ace/Synch.h"
#include "ace/Reactor_Impl.h"
#include "ace/Message_Queue.h"
+#include "ace/Process_Mutex.h"
#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
// If we don't have WinSOCK2, we need these defined
@@ -614,7 +615,7 @@ public:
virtual int timer_queue (ACE_Timer_Queue *tq);
// Set a user-specified timer queue.
virtual ACE_Timer_Queue *timer_queue (void) const;
- // Return the current <ACE_Timer_Queue>.
+ // Return the current <ACE_Timer_Queue>.
virtual int close (void);
// Close down the WFMO_Reactor and release all of its resources.
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index 552067f43a3..b3b77f70b6b 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -1095,6 +1095,25 @@ SOURCE=.\FILE_IO.cpp
# End Source File
# Begin Source File
+SOURCE=.\File_Lock.cpp
+
+!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Filecache.cpp
!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
@@ -2178,6 +2197,44 @@ SOURCE=.\Process_Manager.cpp
# End Source File
# Begin Source File
+SOURCE=.\Process_Mutex.cpp
+
+!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Process_Semaphore.cpp
+
+!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Profile_Timer.cpp
!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
@@ -2387,6 +2444,25 @@ SOURCE=.\Remote_Tokens.cpp
# End Source File
# Begin Source File
+SOURCE=.\RW_Process_Mutex.cpp
+
+!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Sched_Params.cpp
!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
@@ -4179,6 +4255,10 @@ SOURCE=.\FILE_IO.h
# End Source File
# Begin Source File
+SOURCE=.\File_Lock.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Filecache.h
# End Source File
# Begin Source File
@@ -4495,6 +4575,14 @@ SOURCE=.\Process_Manager.h
# End Source File
# Begin Source File
+SOURCE=.\Process_Mutex.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Process_Semaphore.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Profile_Timer.h
# End Source File
# Begin Source File
@@ -4555,6 +4643,10 @@ SOURCE=.\Remote_Tokens.h
# End Source File
# Begin Source File
+SOURCE=.\RW_Process_Mutex.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Sched_Params.h
# End Source File
# Begin Source File
@@ -5155,6 +5247,10 @@ SOURCE=.\FILE_IO.i
# End Source File
# Begin Source File
+SOURCE=.\File_Lock.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\Free_List.i
# End Source File
# Begin Source File
@@ -5387,6 +5483,14 @@ SOURCE=.\Process_Manager.i
# End Source File
# Begin Source File
+SOURCE=.\Process_Mutex.inl
+# End Source File
+# Begin Source File
+
+SOURCE=.\Process_Semaphore.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\Profile_Timer.i
# End Source File
# Begin Source File
@@ -5415,6 +5519,10 @@ SOURCE=.\Remote_Tokens.i
# End Source File
# Begin Source File
+SOURCE=.\RW_Process_Mutex.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\Sched_Params.i
# End Source File
# Begin Source File
diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index 337fe7ac44e..247a4ff8e29 100644
--- a/ace/ace_lib.dsp
+++ b/ace/ace_lib.dsp
@@ -1051,6 +1051,25 @@ SOURCE=.\FILE_IO.cpp
# End Source File
# Begin Source File
+SOURCE=.\File_Lock.cpp
+
+!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Filecache.cpp
!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
@@ -2134,6 +2153,44 @@ SOURCE=.\Process_Manager.cpp
# End Source File
# Begin Source File
+SOURCE=.\Process_Mutex.cpp
+
+!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Process_Semaphore.cpp
+
+!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Profile_Timer.cpp
!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
@@ -2324,6 +2381,25 @@ SOURCE=.\Remote_Tokens.cpp
# End Source File
# Begin Source File
+SOURCE=.\RW_Process_Mutex.cpp
+
+!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Sched_Params.cpp
!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
@@ -4116,6 +4192,10 @@ SOURCE=.\FILE_IO.h
# End Source File
# Begin Source File
+SOURCE=.\File_Lock.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Filecache.h
# End Source File
# Begin Source File
@@ -4432,6 +4512,14 @@ SOURCE=.\Process_Manager.h
# End Source File
# Begin Source File
+SOURCE=.\Process_Mutex.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Process_Semaphore.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Profile_Timer.h
# End Source File
# Begin Source File
@@ -4488,6 +4576,10 @@ SOURCE=.\Remote_Tokens.h
# End Source File
# Begin Source File
+SOURCE=.\RW_Process_Mutex.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Sched_Params.h
# End Source File
# Begin Source File
@@ -5092,6 +5184,10 @@ SOURCE=.\FILE_IO.i
# End Source File
# Begin Source File
+SOURCE=.\File_Lock.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\Free_List.i
# End Source File
# Begin Source File
@@ -5324,6 +5420,14 @@ SOURCE=.\Process_Manager.i
# End Source File
# Begin Source File
+SOURCE=.\Process_Mutex.inl
+# End Source File
+# Begin Source File
+
+SOURCE=.\Process_Semaphore.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\Profile_Timer.i
# End Source File
# Begin Source File
@@ -5352,6 +5456,10 @@ SOURCE=.\Remote_Tokens.i
# End Source File
# Begin Source File
+SOURCE=.\RW_Process_Mutex.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\Sched_Params.i
# End Source File
# Begin Source File
View Lorry Controller Status