headers: remove C99 designated initializers; not supported by C++.

Only looked at header files in //include. Matches were found with:
    $ ack --hh '(?<!\w)\.\w+\s*\='

diff --git a/include/arch/x86_32/barrelfish/syscall_arch.h b/include/arch/x86_32/barrelfish/syscall_arch.h
index 649dd41..a8afbe6 100644 (file)
--- a/include/arch/x86_32/barrelfish/syscall_arch.h
+++ b/include/arch/x86_32/barrelfish/syscall_arch.h
@@ -51,7 +51,7 @@ struct sysret syscall(uintptr_t arg0, uintptr_t arg1,
                    : "+a" (a3_ret1), "+d" (a2_ret2), "+r" (a6)
                    : "r" (a0), "r" (a1), "r" (a4), [arg5] "m" (arg5));
 
-    return (struct sysret){.error = a3_ret1, .value = a2_ret2};
+    return (struct sysret){/*error*/ a3_ret1, /*value*/ a2_ret2};
 }
 
 #define syscall7(_a, _b, _c, _d, _e, _f, _g)    \

diff --git a/include/arch/x86_64/barrelfish/syscall_arch.h b/include/arch/x86_64/barrelfish/syscall_arch.h
index 12f46f0..1452f09 100644 (file)
--- a/include/arch/x86_64/barrelfish/syscall_arch.h
+++ b/include/arch/x86_64/barrelfish/syscall_arch.h
@@ -93,7 +93,7 @@ static inline struct sysret syscall(uint64_t num, uint64_t arg1, uint64_t arg2,
 {
     BF_SYSCALL_BODY(num, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9,
                     arg10, arg11, arg12, "");
-    return (struct sysret){.error = a10_ret1, .value = a2_ret2};
+    return (struct sysret){/*error*/ a10_ret1, /*value*/ a2_ret2};
 }
 
 #define syscall12(_a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l) \

diff --git a/include/barrelfish/caddr.h b/include/barrelfish/caddr.h
index 6758ed4..04a6761 100644 (file)
--- a/include/barrelfish/caddr.h
+++ b/include/barrelfish/caddr.h
@@ -35,8 +35,8 @@ struct cnoderef {
     uint8_t guard_size;     ///< Guard size of the CNode
 } __attribute__((packed));
 
-#define NULL_CNODE (struct cnoderef){ .address = 0, .address_bits = 0, \
-                                      .size_bits = 0, .guard_size = 0 }
+#define NULL_CNODE (struct cnoderef){ /*address*/ 0, /*address_bits*/ 0, \
+                                      /*size_bits*/ 0, /*guard_size*/ 0 }
 
 /**
  * \brief User-level representation of a capability and its CSpace address
@@ -47,7 +47,7 @@ struct capref {
     capaddr_t slot;               ///< Slot number within CNode
 };
 
-#define NULL_CAP (struct capref){ .cnode = NULL_CNODE, .slot = 0 }
+#define NULL_CAP (struct capref){ /*cnode*/ NULL_CNODE, /*slot*/ 0 }
 
 static inline bool capref_is_null(struct capref capref)
 {

diff --git a/include/barrelfish/thread_sync.h b/include/barrelfish/thread_sync.h
index b147757..2501d90 100644 (file)
--- a/include/barrelfish/thread_sync.h
+++ b/include/barrelfish/thread_sync.h
@@ -52,6 +52,12 @@ struct thread_sem {
     struct thread               *queue;
     spinlock_t                  lock;
 };
-#define THREAD_SEM_INITIALIZER          { .value = 0, .queue = NULL, .lock = 0 }
+#ifndef __cplusplus
+#       define THREAD_SEM_INITIALIZER \
+    { .value = 0, .queue = NULL, .lock = 0 }
+#else
+#       define THREAD_SEM_INITIALIZER \
+    { 0, (struct thread *)NULL, 0 }
+#endif
 
 #endif

diff --git a/include/barrelfish/waitset.h b/include/barrelfish/waitset.h
index 40da504..d7ef855 100644 (file)
--- a/include/barrelfish/waitset.h
+++ b/include/barrelfish/waitset.h
@@ -29,7 +29,7 @@ struct event_closure {
     void *arg;
 };
 
-#define MKCLOSURE(h,a)  (struct event_closure){ .handler = (h), .arg = (a) }
+#define MKCLOSURE(h,a)  (struct event_closure){ /*handler*/ (h), /*arg*/ (a) }
 #define NOP_CLOSURE     MKCLOSURE(NULL, NULL)
 
 /**

diff --git a/include/barrelfish_kpi/syscalls.h b/include/barrelfish_kpi/syscalls.h
index beea813..965d9cf 100644 (file)
--- a/include/barrelfish_kpi/syscalls.h
+++ b/include/barrelfish_kpi/syscalls.h
@@ -24,7 +24,7 @@ struct sysret {
 };
 
 /// Macro used for constructing return values from single-value syscalls
-#define SYSRET(x) (struct sysret){ .error = x, .value = 0 }
+#define SYSRET(x) (struct sysret){ /*error*/ x, /*value*/ 0 }
 #endif // __ASSEMBLER__
 
 /*

diff --git a/include/nfs/nfs.h b/include/nfs/nfs.h
index 55b5142..a61cfdb 100644 (file)
--- a/include/nfs/nfs.h
+++ b/include/nfs/nfs.h
@@ -30,7 +30,7 @@ __BEGIN_DECLS
 #define NFS_READDIR_COOKIE 0        ///< initial cookie for readdir
 #define NFS_READDIR_COOKIEVERF NULL ///< initial cookie verifier for readder
 
-#define NULL_NFS_FH ((struct nfs_fh3) { .data_len = 0, .data_val = NULL })
+#define NULL_NFS_FH ((struct nfs_fh3) { /*data_len*/ 0, /*data_val*/ NULL })
 
 struct nfs_client;
 

diff --git a/include/octopus/trigger.h b/include/octopus/trigger.h
index c4a8594..5cc3175 100644 (file)
--- a/include/octopus/trigger.h
+++ b/include/octopus/trigger.h
@@ -20,7 +20,8 @@
 
 #include <octopus/definitions.h>
 
-#define NOP_TRIGGER     (octopus_trigger_t){ .in_case = 0, .m = 0, .trigger = 0, .st = 0 }
+#define NOP_TRIGGER (octopus_trigger_t){ /*in_case*/ 0, /*send_to*/ 0, \
+                                         /*m*/ 0, /*trigger*/ 0, /*st*/ 0 }
 
 typedef void(*trigger_handler_fn)(octopus_mode_t mode, char* record, void* state);
 octopus_trigger_t oct_mktrigger(errval_t, octopus_binding_type_t, octopus_mode_t,