summaryrefslogtreecommitdiff
path: root/TAO/tao/debug.cpp
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-02-21 14:13:06 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-02-21 14:13:06 +0000
commit1021cbf60c7ddd2a9dc5a57595c6404e804a06c9 (patch)
treee099080978c6a602e510b4df0b8617b3b4ae9ac0 /TAO/tao/debug.cpp
parent6b73b5c3972bbe73a18c7e23c71c7a5a01c8d1e4 (diff)
downloadATCD-1021cbf60c7ddd2a9dc5a57595c6404e804a06c9.tar.gz
null f{,un}lockfile with ACE_HAS_DCE_DRAFT4_THREADS
Diffstat (limited to 'TAO/tao/debug.cpp')
-rw-r--r--TAO/tao/debug.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
index 2a641c607f9..59104f35e6a 100644
--- a/TAO/tao/debug.cpp
+++ b/TAO/tao/debug.cpp
@@ -14,10 +14,11 @@
#include "tao/corba.h"
-#if !defined (ACE_HAS_PTHREADS) // _POSIX_THREAD_SAFE_FUNCTIONS implied
-#define flockfile(f)
-#define funlockfile(f)
-#endif /* ACE_HAS_PTHREADS */
+#if !defined (ACE_HAS_PTHREADS) && !defined (ACE_HAS_DCE_DRAFT4_THREADS)
+ // _POSIX_THREAD_SAFE_FUNCTIONS implied
+# define flockfile(f)
+# define funlockfile(f)
+#endif /* ! ACE_HAS_PTHREADS && ! ACE_HAS_DCE_DRAFT4_THREADS */
u_int TAO_Export TAO_debug_level = 0;
char * TAO_Export TAO_debug_filter = "l";
@@ -71,7 +72,7 @@ emit_prefix (FILE *stream)
}
// !defined (ACE_HAS_PTHREADS)
-#else
+#else
// Without threads, guard initialization so it can be repeated,
// and don't emit the thread ID in the messages.
@@ -243,7 +244,7 @@ dmsg_opaque (char *_FAR label,
for (i = 0; i < len; i++)
if (!isprint (buffer [i]))
break;
-
+
if (i < len)
{
if (len >= 20)