summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog24
-rw-r--r--ChangeLogs/ChangeLog-02a24
-rw-r--r--ChangeLogs/ChangeLog-03a24
-rw-r--r--ace/svc_export.h2
-rw-r--r--netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp8
-rw-r--r--netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp4
6 files changed, 58 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 3dd5b8d60c2..8abee2e4228 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,20 @@
+Fri Dec 14 14:05:09 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * ace/svc_export.h:
+ * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp:
+ Found a better way to deal with the inconsistencies in the
+ ACE_Svc_Export macro.
+
+ * netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp:
+ Fixed project file for static library.
+
Fri Dec 14 11:35:01 2001 Craig Rodrigues <crodrigu@bbn.com>
* ace/SSL/SSL_SOCK_Acceptor.h:
- * ace/SSL/SSL_SOCK_Connector.h:
+ * ace/SSL/SSL_SOCK_Connector.h:
* examples/QOS/Simple/Fill_ACE_QoS.h:
* examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h:
- * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h:
+ * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h:
Add #include "ace/OS_QoS.h".
Thu Dec 13 22:16:02 2001 Carlos O'Ryan <coryan@uci.edu>
@@ -54,16 +64,16 @@ Thu Dec 13 18:11:00 2001 Craig Rodrigues <crodrigu@bbn.com>
declare QoS data structures now contained in OS_QoS.h and
OS_QoS.cpp.
- * ace/OS.i:
+ * ace/OS.i:
* ace/OS.cpp: Move QoS enabled socket API functions from OS.i to
OS.cpp.
- * ace/OS_QoS.h (added):
+ * ace/OS_QoS.h (added):
* ace/OS_QoS.cpp (added): OS specific QoS data structures go here.
- * ace/MEM_Acceptor.h:
- * ace/SOCK_Acceptor.cpp:
- * ace/SOCK_Connector.cpp:
+ * ace/MEM_Acceptor.h:
+ * ace/SOCK_Acceptor.cpp:
+ * ace/SOCK_Connector.cpp:
* ace/QoS/QoS_Session.h: Add #include "ace/OS_QoS.h".
* ace/QoS/QoS_Session_Impl.cpp: Add u_long casts to eliminate
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 3dd5b8d60c2..8abee2e4228 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,10 +1,20 @@
+Fri Dec 14 14:05:09 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * ace/svc_export.h:
+ * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp:
+ Found a better way to deal with the inconsistencies in the
+ ACE_Svc_Export macro.
+
+ * netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp:
+ Fixed project file for static library.
+
Fri Dec 14 11:35:01 2001 Craig Rodrigues <crodrigu@bbn.com>
* ace/SSL/SSL_SOCK_Acceptor.h:
- * ace/SSL/SSL_SOCK_Connector.h:
+ * ace/SSL/SSL_SOCK_Connector.h:
* examples/QOS/Simple/Fill_ACE_QoS.h:
* examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h:
- * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h:
+ * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h:
Add #include "ace/OS_QoS.h".
Thu Dec 13 22:16:02 2001 Carlos O'Ryan <coryan@uci.edu>
@@ -54,16 +64,16 @@ Thu Dec 13 18:11:00 2001 Craig Rodrigues <crodrigu@bbn.com>
declare QoS data structures now contained in OS_QoS.h and
OS_QoS.cpp.
- * ace/OS.i:
+ * ace/OS.i:
* ace/OS.cpp: Move QoS enabled socket API functions from OS.i to
OS.cpp.
- * ace/OS_QoS.h (added):
+ * ace/OS_QoS.h (added):
* ace/OS_QoS.cpp (added): OS specific QoS data structures go here.
- * ace/MEM_Acceptor.h:
- * ace/SOCK_Acceptor.cpp:
- * ace/SOCK_Connector.cpp:
+ * ace/MEM_Acceptor.h:
+ * ace/SOCK_Acceptor.cpp:
+ * ace/SOCK_Connector.cpp:
* ace/QoS/QoS_Session.h: Add #include "ace/OS_QoS.h".
* ace/QoS/QoS_Session_Impl.cpp: Add u_long casts to eliminate
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 3dd5b8d60c2..8abee2e4228 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,10 +1,20 @@
+Fri Dec 14 14:05:09 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * ace/svc_export.h:
+ * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp:
+ Found a better way to deal with the inconsistencies in the
+ ACE_Svc_Export macro.
+
+ * netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp:
+ Fixed project file for static library.
+
Fri Dec 14 11:35:01 2001 Craig Rodrigues <crodrigu@bbn.com>
* ace/SSL/SSL_SOCK_Acceptor.h:
- * ace/SSL/SSL_SOCK_Connector.h:
+ * ace/SSL/SSL_SOCK_Connector.h:
* examples/QOS/Simple/Fill_ACE_QoS.h:
* examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h:
- * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h:
+ * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h:
Add #include "ace/OS_QoS.h".
Thu Dec 13 22:16:02 2001 Carlos O'Ryan <coryan@uci.edu>
@@ -54,16 +64,16 @@ Thu Dec 13 18:11:00 2001 Craig Rodrigues <crodrigu@bbn.com>
declare QoS data structures now contained in OS_QoS.h and
OS_QoS.cpp.
- * ace/OS.i:
+ * ace/OS.i:
* ace/OS.cpp: Move QoS enabled socket API functions from OS.i to
OS.cpp.
- * ace/OS_QoS.h (added):
+ * ace/OS_QoS.h (added):
* ace/OS_QoS.cpp (added): OS specific QoS data structures go here.
- * ace/MEM_Acceptor.h:
- * ace/SOCK_Acceptor.cpp:
- * ace/SOCK_Connector.cpp:
+ * ace/MEM_Acceptor.h:
+ * ace/SOCK_Acceptor.cpp:
+ * ace/SOCK_Connector.cpp:
* ace/QoS/QoS_Session.h: Add #include "ace/OS_QoS.h".
* ace/QoS/QoS_Session_Impl.cpp: Add u_long casts to eliminate
diff --git a/ace/svc_export.h b/ace/svc_export.h
index 93a851f6798..b10b4f33bc5 100644
--- a/ace/svc_export.h
+++ b/ace/svc_export.h
@@ -23,7 +23,7 @@
#if defined (ACE_SVC_HAS_DLL)
# if (ACE_SVC_HAS_DLL == 1)
-# if defined (ACE_BUILD_SVC_DLL) || defined (ACE_Svc_BUILD_DLL)
+# if defined (ACE_BUILD_SVC_DLL) || defined (ACE_SVC_BUILD_DLL)
# define ACE_Svc_Export ACE_Proper_Export_Flag
# define ACE_SVC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
# else
diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp
index ab5bf5f78e0..22f0758587b 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp
+++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
-# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /D "NDEBUG" /O2 /MD /D "ACE_Svc_BUILD_DLL" /I "../../../../" /I "" /D ACE_HAS_MFC=1
+# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /D "NDEBUG" /O2 /MD /D "ACE_SVC_BUILD_DLL" /I "../../../../" /I "" /D ACE_HAS_MFC=1
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi
-# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi /D "_DEBUG" /Od /MDd /D "ACE_Svc_BUILD_DLL" /I "../../../../" /I "" /D ACE_HAS_MFC=1
+# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi /D "_DEBUG" /Od /MDd /D "ACE_SVC_BUILD_DLL" /I "../../../../" /I "" /D ACE_HAS_MFC=1
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -97,7 +97,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
-# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /D "NDEBUG" /O2 /MD /D "ACE_Svc_BUILD_DLL" /I "../../../../" /I ""
+# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /D "NDEBUG" /O2 /MD /D "ACE_SVC_BUILD_DLL" /I "../../../../" /I ""
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -123,7 +123,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi
-# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi /D "_DEBUG" /Od /MDd /D "ACE_Svc_BUILD_DLL" /I "../../../../" /I ""
+# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi /D "_DEBUG" /Od /MDd /D "ACE_SVC_BUILD_DLL" /I "../../../../" /I ""
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp
index f52ecd7d5e7..2645130f360 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp
+++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release\Dump_Restore"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
-# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /D "NDEBUG" /O1 /MD /I "../../../../" /I ""
+# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /D "NDEBUG" /O1 /MD /I "../../../../" /I "" /D "ACE_SVC_HAS_DLL=0"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "Debug\Dump_Restore"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi
-# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi /D "_DEBUG" /Od /Gy /MDd /I "../../../../" /I ""
+# ADD CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c /Gm /Zi /D "_DEBUG" /Od /Gy /MDd /I "../../../../" /I "" /D "ACE_SVC_HAS_DLL=0"
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
View Lorry Controller Status