s4:torture/rpc/winreg: fix the build with non gcc compilers (e.g. on solaris)

metze

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index c97a3ddc880f4973d2e086a44f316ac831c46de3..572b6876f111b6323a205e11403195b0db4d76c5 100644 (file)
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -1649,7 +1649,7 @@ static bool test_QueryMultipleValues_full(struct dcerpc_binding_handle *b,
                                          struct torture_context *tctx,
                                          struct policy_handle *handle,
                                          uint32_t num_values,
-                                         const char **valuenames,
+                                         const char * const *valuenames,
                                          bool existing_value)
 {
        struct winreg_QueryMultipleValues r;
@@ -1719,7 +1719,7 @@ static bool test_QueryMultipleValues2_full(struct dcerpc_binding_handle *b,
                                           struct torture_context *tctx,
                                           struct policy_handle *handle,
                                           uint32_t num_values,
-                                          const char **valuenames,
+                                          const char * const *valuenames,
                                           bool existing_value)
 {
        struct winreg_QueryMultipleValues2 r;
@@ -2385,8 +2385,7 @@ static bool test_HKLM_wellknown(struct torture_context *tctx,
 {
        struct policy_handle newhandle;
        int i;
-       /* FIXME: This is GCC specific and breaks Solaris 10 "cc" */
-       struct {
+       static const struct {
                const char *values[3];
                uint32_t num_values;
                bool existing_value;