summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog25
-rw-r--r--ChangeLogs/ChangeLog-02a25
-rw-r--r--ChangeLogs/ChangeLog-03a25
-rw-r--r--WindozeCE/ACEApp.h2
-rw-r--r--ace/Asynch_IO.h2
-rw-r--r--ace/Asynch_IO_Impl.h2
-rw-r--r--ace/CLASSIX/CLASSIX_Port_Default.h2
-rw-r--r--ace/POSIX_Asynch_IO.h2
-rw-r--r--ace/POSIX_Proactor.h2
-rw-r--r--ace/Proactor.h2
-rw-r--r--ace/Proactor_Impl.h2
-rw-r--r--ace/Svc_Conf_Tokens.h6
-rw-r--r--ace/WIN32_Asynch_IO.h2
-rw-r--r--ace/WIN32_Proactor.h2
-rw-r--r--ace/config-aix-4.1.x.h2
-rw-r--r--ace/config-aix-4.2.x.h2
-rw-r--r--ace/config-aix-4.3.x.h2
-rw-r--r--ace/config-hpux-11.x-hpc++.h1
-rw-r--r--ace/config-visualage.h5
19 files changed, 100 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index f640aa2a35b..125baee5a52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+Thu Mar 09 18:20:00 2000 Angelo Corsaro <corsaro@cs.wustl.edu>
+
+ * ace/Asynch_IO.h:
+ * ace/Asynch_IO_Impl.h:
+ * ace/POSIX_Asynch_IO.h:
+ * ace/POSIX_Proactor.h:
+ * ace/Proactor.h:
+ * ace/Proactor_Impl.h:
+ * ace/WIN32_Asynch_IO.h:
+ * ace/WIN32_Proactor.h:
+ * ace/config-aix-4.1.x.h:
+ * ace/config-aix-4.2.x.h:
+ * ace/config-aix-4.3.x.h:
+
+ These files were using the #if !defined (WHATEVER) as multiple
+ inclusion guard instead of #ifndef WHATEVER. Thanks to Paul
+ Calabrese <calabrese_p@ociweb.com> for reporting that.
+
+ * ace/config-visualage.h:
+ * ace/CLASSIX/CLASSIX_Port_Default.h:
+ * ace/Svc_Conf_Tokens.h:
+
+ While this file were missing multiple inclusion guard. Thanks to
+ Paul Calabrese <calabrese_p@ociweb.com> for reporting that.
+
Thu Mar 09 18:06:52 2000 Steve Huston <shuston@riverace.com>
* ace/config-hpux-11.00.h: Added ACE_HAS_SIGTIMEDWAIT and the
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index f640aa2a35b..125baee5a52 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,28 @@
+Thu Mar 09 18:20:00 2000 Angelo Corsaro <corsaro@cs.wustl.edu>
+
+ * ace/Asynch_IO.h:
+ * ace/Asynch_IO_Impl.h:
+ * ace/POSIX_Asynch_IO.h:
+ * ace/POSIX_Proactor.h:
+ * ace/Proactor.h:
+ * ace/Proactor_Impl.h:
+ * ace/WIN32_Asynch_IO.h:
+ * ace/WIN32_Proactor.h:
+ * ace/config-aix-4.1.x.h:
+ * ace/config-aix-4.2.x.h:
+ * ace/config-aix-4.3.x.h:
+
+ These files were using the #if !defined (WHATEVER) as multiple
+ inclusion guard instead of #ifndef WHATEVER. Thanks to Paul
+ Calabrese <calabrese_p@ociweb.com> for reporting that.
+
+ * ace/config-visualage.h:
+ * ace/CLASSIX/CLASSIX_Port_Default.h:
+ * ace/Svc_Conf_Tokens.h:
+
+ While this file were missing multiple inclusion guard. Thanks to
+ Paul Calabrese <calabrese_p@ociweb.com> for reporting that.
+
Thu Mar 09 18:06:52 2000 Steve Huston <shuston@riverace.com>
* ace/config-hpux-11.00.h: Added ACE_HAS_SIGTIMEDWAIT and the
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index f640aa2a35b..125baee5a52 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,28 @@
+Thu Mar 09 18:20:00 2000 Angelo Corsaro <corsaro@cs.wustl.edu>
+
+ * ace/Asynch_IO.h:
+ * ace/Asynch_IO_Impl.h:
+ * ace/POSIX_Asynch_IO.h:
+ * ace/POSIX_Proactor.h:
+ * ace/Proactor.h:
+ * ace/Proactor_Impl.h:
+ * ace/WIN32_Asynch_IO.h:
+ * ace/WIN32_Proactor.h:
+ * ace/config-aix-4.1.x.h:
+ * ace/config-aix-4.2.x.h:
+ * ace/config-aix-4.3.x.h:
+
+ These files were using the #if !defined (WHATEVER) as multiple
+ inclusion guard instead of #ifndef WHATEVER. Thanks to Paul
+ Calabrese <calabrese_p@ociweb.com> for reporting that.
+
+ * ace/config-visualage.h:
+ * ace/CLASSIX/CLASSIX_Port_Default.h:
+ * ace/Svc_Conf_Tokens.h:
+
+ While this file were missing multiple inclusion guard. Thanks to
+ Paul Calabrese <calabrese_p@ociweb.com> for reporting that.
+
Thu Mar 09 18:06:52 2000 Steve Huston <shuston@riverace.com>
* ace/config-hpux-11.00.h: Added ACE_HAS_SIGTIMEDWAIT and the
diff --git a/WindozeCE/ACEApp.h b/WindozeCE/ACEApp.h
index 6d5107dedbf..9ceb9d69727 100644
--- a/WindozeCE/ACEApp.h
+++ b/WindozeCE/ACEApp.h
@@ -1,6 +1,6 @@
// $Id$
-#if !defined (ACE_APP_H)
+#ifndef ACE_APP_H
#define ACE_APP_H
#if !defined (NC_ACE_NOTIRY)
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index 6100ba2386c..1f819f95a49 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -30,7 +30,7 @@
//
// ============================================================================
-#if !defined (ACE_ASYNCH_IO_H)
+#ifndef ACE_ASYNCH_IO_H
#define ACE_ASYNCH_IO_H
#include "ace/OS.h"
diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h
index 3eeefcd565c..e04df1c8bce 100644
--- a/ace/Asynch_IO_Impl.h
+++ b/ace/Asynch_IO_Impl.h
@@ -25,7 +25,7 @@
//
// ============================================================================
-#if !defined (ACE_ASYNCH_IO_IMPL_H)
+#ifndef ACE_ASYNCH_IO_IMPL_H
#define ACE_ASYNCH_IO_IMPL_H
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/CLASSIX/CLASSIX_Port_Default.h b/ace/CLASSIX/CLASSIX_Port_Default.h
index 698c9ff9afe..82e94a6c157 100644
--- a/ace/CLASSIX/CLASSIX_Port_Default.h
+++ b/ace/CLASSIX/CLASSIX_Port_Default.h
@@ -14,7 +14,7 @@
//
// ============================================================================
-#if !defined ACE_CLASSIX_PORT_DEFAULT_H
+#ifndef ACE_CLASSIX_PORT_DEFAULT_H
#define ACE_CLASSIX_PORT_DEFAULT_H
#include "ace/Singleton.h"
diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h
index 8fb292f726e..57335f7b003 100644
--- a/ace/POSIX_Asynch_IO.h
+++ b/ace/POSIX_Asynch_IO.h
@@ -24,7 +24,7 @@
//
// ============================================================================
-#if !defined (ACE_POSIX_ASYNCH_IO_H)
+#ifndef ACE_POSIX_ASYNCH_IO_H
#define ACE_POSIX_ASYNCH_IO_H
#include "ace/OS.h"
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index d9af1faa1c6..4ffcd5620e1 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -16,7 +16,7 @@
//
// ============================================================================
-#if !defined (ACE_POSIX_PROACTOR_H)
+#ifndef ACE_POSIX_PROACTOR_H
#define ACE_POSIX_PROACTOR_H
#include "ace/Proactor_Impl.h"
diff --git a/ace/Proactor.h b/ace/Proactor.h
index dcfffa492e3..229f4470e7d 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -16,7 +16,7 @@
//
// ============================================================================
-#if !defined (ACE_PROACTOR_H)
+#ifndef ACE_PROACTOR_H
#define ACE_PROACTOR_H
#include "ace/OS.h"
diff --git a/ace/Proactor_Impl.h b/ace/Proactor_Impl.h
index 16d5b65d08f..4aff7941c63 100644
--- a/ace/Proactor_Impl.h
+++ b/ace/Proactor_Impl.h
@@ -14,7 +14,7 @@
//
// ============================================================================
-#if !defined (ACE_PROACTOR_IMPL_H)
+#ifndef ACE_PROACTOR_IMPL_H
#define ACE_PROACTOR_IMPL_H
#include "ace/OS.h"
diff --git a/ace/Svc_Conf_Tokens.h b/ace/Svc_Conf_Tokens.h
index f8998fc827d..760a00c9e17 100644
--- a/ace/Svc_Conf_Tokens.h
+++ b/ace/Svc_Conf_Tokens.h
@@ -1,4 +1,8 @@
// $Id$
+
+#ifndef SVC_CONF_TOKENS_H
+#define SVC_CONF_TOKENS_H
+
#define ACE_DYNAMIC 257
#define ACE_STATIC 258
#define ACE_SUSPEND 259
@@ -19,3 +23,5 @@
#define ACE_RBRACE 274
#define ACE_STAR 275
#define ACE_COLON 276
+
+#endif //SVC_CONF_TOKENS_H
diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h
index d3de0b40642..18e1eb5d3d4 100644
--- a/ace/WIN32_Asynch_IO.h
+++ b/ace/WIN32_Asynch_IO.h
@@ -27,7 +27,7 @@
//
// ============================================================================
-#if !defined (ACE_WIN32_ASYNCH_IO_H)
+#ifndef ACE_WIN32_ASYNCH_IO_H
#define ACE_WIN32_ASYNCH_IO_H
#include "ace/OS.h"
diff --git a/ace/WIN32_Proactor.h b/ace/WIN32_Proactor.h
index cc7dec6e120..ef1f03c8352 100644
--- a/ace/WIN32_Proactor.h
+++ b/ace/WIN32_Proactor.h
@@ -16,7 +16,7 @@
//
// ============================================================================
-#if !defined (ACE_WIN32_PROACTOR_H)
+#ifndef ACE_WIN32_PROACTOR_H
#define ACE_WIN32_PROACTOR_H
#include "ace/OS.h"
diff --git a/ace/config-aix-4.1.x.h b/ace/config-aix-4.1.x.h
index 1ebd21479b8..9c2baafd739 100644
--- a/ace/config-aix-4.1.x.h
+++ b/ace/config-aix-4.1.x.h
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
// $Id$
-#if !defined (ACE_AIX_MAJOR_VERS)
+#ifndef ACE_AIX_MAJOR_VERS
# define ACE_AIX_MAJOR_VERS 4
#endif
#if !defined (ACE_AIX_MINOR_VERS)
diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h
index 25672351a0c..dbf51bbb06c 100644
--- a/ace/config-aix-4.2.x.h
+++ b/ace/config-aix-4.2.x.h
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
// $Id$
-#if !defined (ACE_AIX_MAJOR_VERS)
+#ifndef ACE_AIX_MAJOR_VERS
# define ACE_AIX_MAJOR_VERS 4
#endif
#if !defined (ACE_AIX_MINOR_VERS)
diff --git a/ace/config-aix-4.3.x.h b/ace/config-aix-4.3.x.h
index dae15950e06..55b3818809a 100644
--- a/ace/config-aix-4.3.x.h
+++ b/ace/config-aix-4.3.x.h
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
// $Id$
-#if !defined (ACE_AIX_MAJOR_VERS)
+#ifndef ACE_AIX_MAJOR_VERS
# define ACE_AIX_MAJOR_VERS 4
#endif
#if !defined (ACE_AIX_MINOR_VERS)
diff --git a/ace/config-hpux-11.x-hpc++.h b/ace/config-hpux-11.x-hpc++.h
index 9b3474dd64b..116b59bfc23 100644
--- a/ace/config-hpux-11.x-hpc++.h
+++ b/ace/config-hpux-11.x-hpc++.h
@@ -3,4 +3,5 @@
// This config file is obsolete and will disappear with the ACE 5.1 release.
// use config-hpux-11.00.h instead, regardless of the compiler you use.
+
#error "Use config-hpux-11.00.h instead"
diff --git a/ace/config-visualage.h b/ace/config-visualage.h
index 8fa97f7fa89..8ef53d4d6f1 100644
--- a/ace/config-visualage.h
+++ b/ace/config-visualage.h
@@ -4,6 +4,9 @@
// This configuration file automatically includes the proper
// configurations for IBM's VisualAge C++ compiler on Win32 and AIX.
+#ifndef CONFIG_VISUALAGE_H
+#define CONFIG_VISUALAGE_H
+
#ifdef __TOS_WIN__
#include "ace/config-win32.h"
#elif __TOS_AIX__
@@ -11,3 +14,5 @@
#else
#include "PLATFORM NOT SPECIFIED"
#endif /* __TOS_WIN__ */
+
+#endif //CONFIG_VISUALAGE_H
View Lorry Controller Status