Merge pull request #27 from am11/c99

Convert to plain C99
yuk7 · Dec 26, 2018 · c7907c9 · c7907c9
2 parents 153f6d3 + 9578fad
commit c7907c9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,16 +6,16 @@ compiler:
 addons:
   apt:
     packages:
-    - g++-mingw-w64-x86-64
+    - gcc-mingw-w64-x86-64
     - binutils-mingw-w64-x86-64
     - zip
 script:
 - '[ -z "$TRAVIS_TAG" ] || SW_VER=-DSW_VER=L\"$TRAVIS_TAG\"'
 - 'mkdir out zip'
-- 'x86_64-w64-mingw32-g++ --static main.cpp -o out/Launcher.exe $SW_VER'
+- 'x86_64-w64-mingw32-gcc -std=c99 --static main.c -o out/Launcher.exe $SW_VER'
 - 'find  ./res/* -maxdepth 1 -type d -printf ''%f\n'' > resl.txt'
 - 'xargs -a resl.txt -I{} x86_64-w64-mingw32-windres res/{}/res.rc -o res/{}.o'
-- 'xargs -a resl.txt -I{} x86_64-w64-mingw32-g++ --static main.cpp res/{}.o -o zip/{}.exe $SW_VER'
+- 'xargs -a resl.txt -I{} x86_64-w64-mingw32-gcc -std=c99 --static main.c res/{}.o -o zip/{}.exe $SW_VER'
 - 'cd zip'
 - 'zip ../out/icons.zip *'
 - 'cd ..'

diff --git a/main.cpp → main.c b/main.cpp → main.c
@@ -7,6 +7,7 @@
  */
 
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -88,7 +89,7 @@ int main()
 
         if(wargc == 1)
         {
-            WslInstallation wslInstallation = WslGetInstallationInfo(TargetName);
+            struct WslInstallation wslInstallation = WslGetInstallationInfo(TargetName);
             char buffer[MAX_BASEPATH_SIZE];
             wcstombs(buffer, wslInstallation.basePath, MAX_BASEPATH_SIZE);
             if (!dirExists(buffer))
@@ -200,7 +201,7 @@ int main()
                 }
                 else if(wcscmp(wargv[2],L"--lxuid") == 0)
                 {
-                    WslInstallation wsl = WslGetInstallationInfo(TargetName);
+                    struct WslInstallation wsl = WslGetInstallationInfo(TargetName);
                     if(wsl.uuid == NULL)
                     {
                         hr = E_FAIL;

diff --git a/wsld.h b/wsld.h
@@ -45,7 +45,7 @@ WSLLAUNCH WslLaunch;
 struct WslInstallation {
     wchar_t uuid[UUID_SIZE];
     wchar_t basePath[MAX_BASEPATH_SIZE];
-};
+} WslInstallation;
 
 void WslApiFree()
 {
@@ -82,8 +82,8 @@ int WslApiInit()
 return 0;
 }
 
-WslInstallation WslGetInstallationInfo(wchar_t *DistributionName) {
-    WslInstallation wslInstallation;
+struct WslInstallation WslGetInstallationInfo(wchar_t *DistributionName) {
+    struct WslInstallation wslInstallation;
 
     wchar_t RKey[]=L"Software\\Microsoft\\Windows\\CurrentVersion\\Lxss";
     HKEY hKey;