contrib: fix gmp for UWP build

Change-Id: Ibf33e5c472287f4b6e2be2b0fff101d7e5b2c7b8
Tuleap: #790

MSVC/ring-daemon.vcxproj

@@ -389,6 +389,7 @@
       <BasicRuntimeChecks>
       </BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

contrib/src/gmp/fetch_and_patch.bat

 set BUILD=%SRC%..\build
 
-set REPOURL="https://github.com/ShiftMediaProject/gmp.git"
+set GMP_VERSION=3c8f5a0ae0c2ac9ff0ea31b27f71b152979b556d
+set GMP_URL="https://github.com/ShiftMediaProject/gmp.git"
 
 mkdir %BUILD%
 cd %BUILD%
 
-git clone %REPOURL%
+git clone %GMP_URL%
+cd %GMP_URL%
+git checkout %GMP_VERSION%
 
 cd gmp
 git apply --reject --whitespace=fix %SRC%\gmp\gmp-uwp.patch

contrib/src/gmp/gmp-uwp.patch

@@ -94,6 +94,17 @@
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+--- a/SMP/config.h
++++ b/SMP/config.h
+@@ -202,7 +202,7 @@
+ /* #undef HAVE_NATIVE_mpn_add_n_sub_n */
+ #define HAVE_NATIVE_mpn_add_nc 1
+ #if defined(__x86_64) || defined(_M_X64)
+-#define HAVE_NATIVE_mpn_addaddmul_1msb0 1
++#define HAVE_NATIVE_mpn_addaddmul_1msb0 0
+ #define HAVE_NATIVE_mpn_addlsh1_n 1
+ #define HAVE_NATIVE_mpn_addlsh2_n 1
+ #define HAVE_NATIVE_mpn_addlsh_n 1
 -- 
 2.8.1.windows.1
 

src/logger.cpp

@@ -118,8 +118,13 @@ getHeader(const char* ctx)
     out.fill(prev_fill);
 
     // Context
-    if (ctx)
+    if (ctx) {
+#ifdef RING_UWP
+        out << "|" << std::setw(32) << ctx;
+#else
         out << "|" << std::setw(24) << ctx;
+#endif
+    }
 
     out << "] ";