summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ace/DEV_Addr.h2
-rw-r--r--ace/Handle_Set.h4
-rw-r--r--ace/IOStream_T.h2
-rw-r--r--ace/Local_Tokens.h2
-rw-r--r--ace/Message_Block.h4
-rw-r--r--ace/Message_Block.i4
-rw-r--r--ace/OS.h19
-rw-r--r--ace/SPIPE_Acceptor.h2
-rw-r--r--ace/Svc_Conf.h2
9 files changed, 21 insertions, 20 deletions
diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h
index 8f5d995b6a4..1d4df8b958b 100644
--- a/ace/DEV_Addr.h
+++ b/ace/DEV_Addr.h
@@ -48,7 +48,7 @@ public:
#if defined (UNICODE)
virtual int addr_to_string (wchar_t *addr, size_t) const;
// Transform the current address into string format.
-#endif
+#endif /* UNICODE */
virtual int addr_to_string (char *addr, size_t) const;
// Transform the current address into string format.
diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index dc80c410cf5..b62cc4ca216 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -82,9 +82,9 @@ private:
enum
{
WORDSIZE = NFDBITS,
-#if !defined(ACE_WIN32)
+#if !defined (ACE_WIN32)
NUM_WORDS = howmany (MAXSIZE, NFDBITS),
-#endif
+#endif /* ACE_WIN32 */
NBITS = 256
};
diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h
index 797162ef113..0510c671946 100644
--- a/ace/IOStream_T.h
+++ b/ace/IOStream_T.h
@@ -143,7 +143,7 @@ public:
#else
virtual int ipfx0(void) { return(iostream::ipfx(0)); }
virtual int ipfx1(void) { return(iostream::ipfx(1)); }
-#endif
+#endif /* __GNUC__ */
virtual int ipfx (int need = 0) { return(iostream::ipfx(need)); }
virtual void isfx (void) { iostream::isfx(); return; }
virtual int opfx (void) { return(iostream::opfx()); }
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index cae37cd89bb..acf38160ddf 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -193,7 +193,7 @@ public:
{
return this;
}
-#endif
+#endif /* ACE_NO_TSS_TOKENS */
private:
ACE_TSS_TPQ_Entry (const ACE_TSS_TPQ_Entry &);
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index bfa26d5c5f0..397108bcef6 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -224,7 +224,7 @@ public:
size_t size,
Message_Flags = DONT_DELETE);
// Set message data (doesn't reallocate).
-#endif
+#endif /* 0 */
char *end (void) const;
// Return a pointer to 1 past the end of the data in a message.
@@ -392,7 +392,7 @@ public:
size_t size,
Message_Flags = DONT_DELETE);
// Set message data pointer (doesn't reallocate).
-#endif
+#endif /* 0 */
char *end (void) const;
// Return a pointer to 1 past the end of the data in a message.
diff --git a/ace/Message_Block.i b/ace/Message_Block.i
index 7a90b40d166..005ad2ffd21 100644
--- a/ace/Message_Block.i
+++ b/ace/Message_Block.i
@@ -35,7 +35,7 @@ ACE_Data_Block::base (char *msg_data,
this->base_ = msg_data;
this->flags_ = msg_flags;
}
-#endif
+#endif /* 0 */
ACE_INLINE ACE_Message_Block::Message_Flags
ACE_Data_Block::set_flags (ACE_Message_Block::Message_Flags more_flags)
@@ -195,7 +195,7 @@ ACE_Message_Block::base (char *msg_data,
this->wr_ptr_ = msg_data;
this->data_block ()->base (msg_data, msg_lenth, msg_flags);
}
-#endif
+#endif /* 0 */
ACE_INLINE char *
ACE_Message_Block::rd_ptr (void)
diff --git a/ace/OS.h b/ace/OS.h
index 6e7053683ab..8919e3bf02b 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -551,7 +551,7 @@ public:
#if defined (ACE_WIN32)
ACE_Time_Value (const FILETIME &ft);
// Initializes the ACE_Time_Value object from a Win32 FILETIME
-#endif
+#endif /* ACE_WIN32 */
void set (long sec, long usec);
// Construct a <Time_Value> from two <long>s.
@@ -1558,7 +1558,7 @@ typedef int ACE_thread_key_t;
// Thanks to Thilo Kielmann" <kielmann@informatik.uni-siegen.de> for this fix.
#if defined (DIGITAL_UNIX)
#undef sigwait
-#endif
+#endif /* DIGITAL_UNIX */
#if defined (ACE_HAS_BROKEN_SENDMSG)
typedef struct msghdr ACE_SENDMSG_TYPE;
@@ -2000,11 +2000,11 @@ typedef char TCHAR;
#define ACE_LD_SEARCH_PATH "LD_LIBRARY_PATH"
#define ACE_LD_SEARCH_PATH_SEPARATOR_STR ":"
#define ACE_LOGGER_KEY "/tmp/server_daemon"
-#ifdef __hpux
+#if defined (__hpux)
#define ACE_DLL_SUFFIX ".sl"
#else
#define ACE_DLL_SUFFIX ".so"
-#endif
+#endif /* __hpux */
#define ACE_DLL_PREFIX "lib"
// The following 3 defines are used by the ACE Name Server...
@@ -2134,7 +2134,7 @@ struct ACE_OVERLAPPED
#if defined (ACE_HAS_BROKEN_IF_HEADER)
struct ifafilt;
-#endif
+#endif /* ACE_HAS_BROKEN_IF_HEADER */
#if defined (ACE_HAS_AIX_BROKEN_SOCKET_HEADER)
#undef __cplusplus
@@ -2142,9 +2142,10 @@ struct ifafilt;
#define __cplusplus
#else
#include /**/ <sys/socket.h>
-#endif
+#endif /* ACE_HAS_AIX_BROKEN_SOCKET_HEADER */
-extern "C" {
+extern "C"
+{
#if defined (VXWORKS)
struct hostent {
char *h_name; /* official name of host */
@@ -2629,7 +2630,7 @@ struct sigaction
#if !defined (WNOHANG)
#define WNOHANG 42
-#endif
+#endif /* !WNOHANG */
#if !defined (EDEADLK)
#define EDEADLK 1000 /* Some large number.... */
@@ -2847,7 +2848,7 @@ typedef void (*ACE_Sig_Handler_Ex) (int, siginfo_t *siginfo, ucontext_t *ucontex
#if defined (ACE_REDEFINES_XTI_FUNCTIONS)
#include /**/ <xti.h>
-#ifdef UNIXWARE /* They apparantly forgot one... */
+#if defined (UNIXWARE) /* They apparantly forgot one... */
extern "C" int _xti_error(char *);
#endif /* UNIXWARE */
#endif /* ACE_REDEFINES_XTI_FUNCTIONS */
diff --git a/ace/SPIPE_Acceptor.h b/ace/SPIPE_Acceptor.h
index 96efc060c65..84d1b2b42b7 100644
--- a/ace/SPIPE_Acceptor.h
+++ b/ace/SPIPE_Acceptor.h
@@ -32,7 +32,7 @@ public:
MAX_PIPE_INSTANCES = PIPE_UNLIMITED_INSTANCES,
MAX_ACCEPT_ATTEMPTS = 3
};
-#endif
+#endif /* ACE_WIN32 */
// = Initialization and termination methods.
ACE_SPIPE_Acceptor (void);
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index cfbbfa7496d..50e12df8d44 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -28,7 +28,7 @@
#if defined (DEBUGGING)
#if defined (YY_DECL)
#undef YY_DECL
-#endif
+#endif /* YY_DECL */
#define YY_DECL extern "C" char *ace_yylex (void)
#else
#define YY_DECL extern "C" int ace_yylex (void)
View Lorry Controller Status