commit 6e538b4020be19a4381830b5d5d3d06bc4d7e841
author Pierre Ossman <ossman@cendio.se> Tue Mar 03 16:48:01 2015 +0100
committer Pierre Ossman <ossman@cendio.se> Tue Mar 03 16:48:01 2015 +0100
tree 8db96ead3a0b551792520856bf7000024b71bc5a
parent 4c33d0bd98e6f3ddfb368917952b9a8d85594229

Fix bad initialiser lists

vncviewer/parameters.cxx

diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx
index 713ac07..712a257 100644
--- a/vncviewer/parameters.cxx
+++ b/vncviewer/parameters.cxx
@@ -182,8 +182,8 @@
 static struct {
   const char first;
   const char second;
-} replaceMap[] = {'\n', 'n',
-                  '\r', 'r'};
+} replaceMap[] = { { '\n', 'n' },
+                   { '\r', 'r' } };
 
 static bool encodeValue(const char* val, char* dest, size_t destSize) {
 

win/rfb_win32/Security.cxx

diff --git a/win/rfb_win32/Security.cxx b/win/rfb_win32/Security.cxx
index b4e9353..cad1325 100644
--- a/win/rfb_win32/Security.cxx
+++ b/win/rfb_win32/Security.cxx
@@ -122,7 +122,7 @@
 
 Sid::Administrators::Administrators() {
   PSID sid = 0;
-  SID_IDENTIFIER_AUTHORITY ntAuth = SECURITY_NT_AUTHORITY;
+  SID_IDENTIFIER_AUTHORITY ntAuth = { SECURITY_NT_AUTHORITY };
   if (!AllocateAndInitializeSid(&ntAuth, 2,
                                 SECURITY_BUILTIN_DOMAIN_RID,
                                 DOMAIN_ALIAS_RID_ADMINS,
@@ -134,7 +134,7 @@
 
 Sid::SYSTEM::SYSTEM() {
   PSID sid = 0;
-  SID_IDENTIFIER_AUTHORITY ntAuth = SECURITY_NT_AUTHORITY;
+  SID_IDENTIFIER_AUTHORITY ntAuth = { SECURITY_NT_AUTHORITY };
   if (!AllocateAndInitializeSid(&ntAuth, 1,
                                 SECURITY_LOCAL_SYSTEM_RID,
                                 0, 0, 0, 0, 0, 0, 0, &sid))