--- /usr/include/mysql/storage/ndb/mgmapi/mgmapi.h	2007-02-25 07:12:18.000000000 +0100
+++ /usr/include/mysql/storage/ndb/mgmapi/mgmapi.h-patched	2007-03-09 16:12:48.000000000 +0100
@@ -270,6 +270,7 @@
   };
 
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
+#ifdef __cplusplus
   struct Ndb_Mgm_Error_Msg {
     enum ndb_mgm_error  code;
     const char *        msg;
@@ -309,6 +310,7 @@
   const int ndb_mgm_noOfErrorMsgs =
   sizeof(ndb_mgm_error_msgs)/sizeof(struct Ndb_Mgm_Error_Msg);
 #endif
+#endif
 
   /**
    *   Status of a node in the cluster.
@@ -409,6 +411,17 @@
   };
 #endif
 
+  struct ndb_mgm_severity {
+    enum ndb_mgm_event_severity category;
+    unsigned int value;
+  };
+
+  struct ndb_mgm_loglevel {
+    enum ndb_mgm_event_category category;
+    unsigned int value;
+  };
+
+
   /***************************************************************************/
   /**
    * @name Functions: Error Handling
@@ -663,7 +676,7 @@
   const char * ndb_mgm_get_node_status_string(enum ndb_mgm_node_status status);
 
   const char * ndb_mgm_get_event_severity_string(enum ndb_mgm_event_severity);
-  ndb_mgm_event_category ndb_mgm_match_event_category(const char *);
+  enum ndb_mgm_event_category ndb_mgm_match_event_category(const char *);
   const char * ndb_mgm_get_event_category_string(enum ndb_mgm_event_category);
 #endif
 
@@ -1218,13 +1231,8 @@
   int ndb_mgm_filter_clusterlog(NdbMgmHandle h,
 				enum ndb_mgm_clusterlog_level s,
 				int e, struct ndb_mgm_reply* r)
-  { return ndb_mgm_set_clusterlog_severity_filter(h,(ndb_mgm_event_severity)s,
+  { return ndb_mgm_set_clusterlog_severity_filter(h,(enum ndb_mgm_event_severity)s,
 						  e,r); }
-  struct ndb_mgm_severity {
-    enum ndb_mgm_event_severity category;
-    unsigned int value;
-  };
-  
   inline
   const unsigned int * ndb_mgm_get_logfilter(NdbMgmHandle h)
   { return ndb_mgm_get_clusterlog_severity_filter_old(h); }
@@ -1235,11 +1243,6 @@
 				      int l, struct ndb_mgm_reply* r)
   { return ndb_mgm_set_clusterlog_loglevel(h,n,c,l,r); }
 
-  struct ndb_mgm_loglevel {
-    enum ndb_mgm_event_category category;
-    unsigned int value;
-  };
-
   inline
   const unsigned int * ndb_mgm_get_loglevel_clusterlog(NdbMgmHandle h)
   { return ndb_mgm_get_clusterlog_loglevel_old(h); }