publish changes

Src/Plugins/Portable/pmp_ipod/SysInfoXML.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include <stddef.h> // for offsetof
 #include <winioctl.h>
 #include <strsafe.h>

Src/Plugins/Portable/pmp_ipod/eject.cpp

@@ -1,6 +1,6 @@
 // this file almost totally copied from MSDN
 
-#include <windows.h>
+#include <arch.h>
 #include <stdio.h>
 #include <winioctl.h>
 
@@ -140,7 +140,7 @@ BOOL EjectVolume(TCHAR cDriveLetter)
 #else
 #include <stdio.h>
 
-#include <windows.h>
+#include <arch.h>
 
 #include <Setupapi.h>
 #include <winioctl.h>

Src/Plugins/Portable/pmp_ipod/filecopy.cpp

@@ -1,5 +1,5 @@
 #include "api.h"
-#include <windows.h>
+#include <arch.h>
 #include <stdio.h>
 #include <wchar.h>
 #include "resource.h"

Src/Plugins/Portable/pmp_ipod/iPodArtworkDB.h

@@ -36,7 +36,7 @@
 #pragma once
 
 //#include <stdio.h>
-#include <windows.h>
+#include <arch.h>
 #include <vector>
 #include <map>
 #include <bfc/platform/types.h>

Src/Plugins/Portable/pmp_ipod/iPodDB.cpp

@@ -46,7 +46,7 @@
 #include <bfc/platform/types.h>
 #include <assert.h>
 #include <time.h>
-#include <windows.h>
+#include <arch.h>
 #include <tchar.h>
 #include <math.h>
 #include <vector>
@@ -166,14 +166,14 @@ int STRCMP_NULLOK(const wchar_t *pa, const wchar_t *pb) {
 }
 #undef SKIP_THE_AND_WHITESPACE
 
-// convert Macintosh timestamp to windows timestamp
+// convert Macintosh timestamp to arch timestamp
 time_t mactime_to_wintime (const unsigned long mactime)
 {
 	if (mactime != 0) return (time_t)(mactime - 2082844800);
 	else return (time_t)mactime;
 }
 
-// convert windows timestamp to Macintosh timestamp
+// convert arch timestamp to Macintosh timestamp
 unsigned long wintime_to_mactime (const __time64_t time)
 {
 	return (unsigned long)(time + 2082844800);

Src/Plugins/Portable/pmp_ipod/iPodDB.h

@@ -47,7 +47,7 @@
 #pragma warning( disable : 4786)
 
 #include <algorithm>
-#include <windows.h>
+#include <arch.h>
 #include <bfc/platform/types.h>
 #include <map>
 #include <vector>

Src/Plugins/Portable/pmp_ipod/iPodDevice.h

@@ -1,8 +1,8 @@
 #ifndef _IPODDEVICE_H_
 #define _IPODDEVICE_H_
 
-#include <windows.h>
-#include <windowsx.h>
+#include <arch.h>
+#include <archx.h>
 #include <stdio.h>
 #include <shlobj.h>
 #include <time.h>

Src/Plugins/Portable/pmp_ipod/iPodInfo.cpp

@@ -10,7 +10,7 @@
 #include <api/service/waservicefactory.h>
 
 #include <stdio.h>
-#include <windows.h>
+#include <arch.h>
 #include <strsafe.h>
 
 extern PMPDevicePlugin plugin;

Src/Plugins/Portable/pmp_ipod/pmp_ipod.vcxproj

@@ -92,26 +92,26 @@
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
     <VcpkgConfiguration>Debug</VcpkgConfiguration>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
     <VcpkgConfiguration>Debug</VcpkgConfiguration>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>