Various fixes - inlcudes CP-32780, CP-29452, CA-75634, CA-280976, CA-333394)

c/autogen/include/xen/api/xen_common.h

@@ -1,19 +1,19 @@
 /*
  * Copyright (c) Citrix Systems, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  *   1) Redistributions of source code must retain the above copyright
  *      notice, this list of conditions and the following disclaimer.
- * 
+ *
  *   2) Redistributions in binary form must reproduce the above
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials
  *      provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -45,6 +45,14 @@
 #endif
 #endif
 
+#ifndef XEN_API_TYPE
+#ifdef __cplusplus
+#define XEN_API_TYPE type_name
+#else
+#define XEN_API_TYPE typename
+#endif
+#endif
+
 #include "xen_api_version.h"
 #include "xen/api/xen_host_decl.h"
 #include "xen/api/xen_task_decl.h"