Remove inclusion of stdbool.h where not needed.

Change OMPI code in libevent to not use bool.
Add some comments to indicate OMPI specific code.
This should fix compiles on Sun Studio Solaris.

This commit was SVN r24062.

opal/mca/event/libevent207/libevent/event.c

@@ -505,8 +505,9 @@ event_enable_debug_mode(void)
 #endif
 }
 
+/****    OMPI CHANGE    ****/
 void
-event_set_debug_output(bool output)
+event_set_debug_output(int output)
 {
 #ifndef _EVENT_DISABLE_DEBUG_MODE
     event_enable_debug_output = output;

opal/mca/event/libevent207/libevent/include/event2/event.h

@@ -44,14 +44,6 @@ extern "C" {
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
-#ifndef WIN32
-/** OMPI 
- * wrap include stdbool.h with ifdef to prevent certain C++ compilers choking on bool redefine 
- */
-#    if !(defined(c_plusplus) || defined(__cplusplus))
-#        include <stdbool.h>
-#    endif
-#endif
 
 #include <stdio.h>
 
@@ -81,7 +73,8 @@ struct event_config;
  */
 void event_enable_debug_mode(void);
 
-void event_set_debug_output(bool output);
+/****    OMPI CHANGE    ****/
+void event_set_debug_output(int output);
 
 /**
  * When debugging mode is enabled, informs Libevent that an event should no

opal/mca/event/libevent207/libevent/log-internal.h

@@ -29,10 +29,6 @@
 
 #include <event2/util.h>
 
-#ifndef WIN32
-#include <stdbool.h>
-#endif
-
 #ifdef __GNUC__
 #define EV_CHECK_FMT(a,b) __attribute__((format(printf, a, b)))
 #define EV_NORETURN __attribute__((noreturn))
@@ -60,6 +56,7 @@ void _event_debugx(const char *fmt, ...) EV_CHECK_FMT(1,2);
 
 #undef EV_CHECK_FMT
 
-extern bool event_enable_debug_output;
+/****    OMPI CHANGE    ****/
+extern int event_enable_debug_output;
 
 #endif

opal/mca/event/libevent207/libevent/log.c

@@ -63,7 +63,8 @@ static void event_exit(int errcode) EV_NORETURN;
 
 static event_fatal_cb fatal_fn = NULL;
 
-bool event_enable_debug_output = false;
+/****    OMPI CHANGE    ****/
+int event_enable_debug_output = 0;
 
 void
 event_set_fatal_callback(event_fatal_cb cb)

opal/mca/event/libevent207/libevent207_module.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  */
 #include "opal_config.h"
 #include "config.h"
@@ -30,9 +31,6 @@
 #include <string.h>
 #include <assert.h>
 #include <time.h>
-#ifndef WIN32
-#include <stdbool.h>
-#endif
 
 #include "opal/class/opal_object.h"
 #include "opal/threads/mutex.h"