summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2004-11-18 15:35:50 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2004-11-18 15:35:50 +0000
commitd2e76b3bb3f55e48fa05e1f790e8b33123c6e103 (patch)
tree4fc2d70973b56f373401216e64bc6662abb9a0cc
parent51b2ebde4cae26e20d36e702ca7f522e038471dd (diff)
downloadATCD-d2e76b3bb3f55e48fa05e1f790e8b33123c6e103.tar.gz
ChangeLogTag: Thu Nov 18 09:35:01 2004 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog19
-rw-r--r--examples/APG/Processes/Spawn.cpp4
-rw-r--r--examples/APG/ThreadManagement/Priorities.cpp6
3 files changed, 20 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 21f6ae1e326..3ca3694b40d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,24 @@
+Thu Nov 18 09:35:01 2004 Chad Elliott <elliott_c@ociweb.com>
+
+ * examples/APG/Processes/Spawn.cpp:
+ * examples/APG/ThreadManagement/Priorities.cpp:
+
+ Fixed build problems with VxWorks specific code.
+
Thu Nov 18 14:42:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
- * ace/OS_NS_Thread.inl:
- Fixed unused arg warning.
+ * ace/OS_NS_Thread.inl:
+ Fixed unused arg warning.
Thu Nov 18 14:38:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
- * ace/Semaphore.cpp:
- Change to improve support for platforms missing shmopen().
+ * ace/Semaphore.cpp:
+ Change to improve support for platforms missing shmopen().
Thu Nov 18 14:35:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
- * ace/config-cygwin32.h:
- Changed some defines to improve Cygwin build.
+ * ace/config-cygwin32.h:
+ Changed some defines to improve Cygwin build.
Thu Nov 18 07:38:34 2004 Chad Elliott <elliott_c@ociweb.com>
diff --git a/examples/APG/Processes/Spawn.cpp b/examples/APG/Processes/Spawn.cpp
index d3395748eba..3e6380db914 100644
--- a/examples/APG/Processes/Spawn.cpp
+++ b/examples/APG/Processes/Spawn.cpp
@@ -105,7 +105,7 @@ private:
}
// Listing 2
-#if !defined (ACE_WIN32)
+#if !defined (ACE_WIN32) && !defined (ACE_LACKS_PWD_FUNCTIONS)
// Listing 10 code/ch10
int setUserID (ACE_Process_Options &options)
{
@@ -159,7 +159,7 @@ public:
void showWho (void)
{
ACE_TRACE ("Slave::showWho");
-#if !defined (ACE_WIN32)
+#if !defined (ACE_WIN32) && !defined (ACE_LACKS_PWD_FUNCTIONS)
passwd *pw = ::getpwuid (::geteuid ());
ACE_DEBUG ((LM_INFO,
ACE_TEXT ("(%P) Running this process as:%s\n"),
diff --git a/examples/APG/ThreadManagement/Priorities.cpp b/examples/APG/ThreadManagement/Priorities.cpp
index a7d7effdabf..7cd32d4c7c5 100644
--- a/examples/APG/ThreadManagement/Priorities.cpp
+++ b/examples/APG/ThreadManagement/Priorities.cpp
@@ -42,10 +42,14 @@ private:
};
// Listing 2
+#if !defined (ACE_THR_PRI_OTHER_MAX)
// This should be fixed in ACE... There's no _MAX, _MIN values for
// thread priorities.
-#if defined (ACE_WIN32) && !defined (ACE_THR_PRI_OTHER_MAX)
+#if defined (ACE_WIN32)
# define ACE_THR_PRI_OTHER_MAX ((ACE_THR_PRI_OTHER_DEF) + 1)
+#elif defined (VXWORKS)
+# define ACE_THR_PRI_OTHER_MAX 0
+#endif
#endif
// Listing 1 code/ch13