merged RTI2 and distrrtgen_linux branch

diff --combined BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
index d45c6d122673c8ccedacb258a881f3794e5a819a,96f76e471c2a327e163657eac2fe37ea77cc872d..0fb305ca52bef56967b6f3a473b92d8aad2f75d6
--- 1/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
--- 2/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
+++ b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
      <ProjectConfiguration Include="Debug|Win32">
@@@ -89,8 -89,8 +89,8 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>/boinc/lib;/boinc/api;/boinc/zip;/boinc/client/win;/boinc/;../../rt api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>WIN32;_DEBUG;_MT;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>../../../common/rt api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <PreprocessorDefinitions>BOINC;WIN32;_DEBUG;_MT;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <MinimalRebuild>true</MinimalRebuild>
        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@@ -114,11 -114,11 +114,11 @@@
        <IntrinsicFunctions>true</IntrinsicFunctions>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>C:\Users\mwj\Desktop\frt\rti2\Common\rt api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <AdditionalIncludeDirectories>..\..\..\Common\rt api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>BOINC;WIN32;NDEBUG;_MT;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
        <FunctionLevelLinking>true</FunctionLevelLinking>
 -      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
 +      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
        <PrecompiledHeader>
        </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
@@@ -213,7 -213,6 +213,7 @@@
      <ClInclude Include="..\..\..\Common\rt api\ChainWalkContext.h" />
      <ClInclude Include="..\..\..\Common\rt api\des.h" />
      <ClInclude Include="..\..\..\Common\rt api\des_locl.h" />
 +    <ClInclude Include="..\..\..\Common\rt api\global.h" />
      <ClInclude Include="distrrtgen.h" />
      <ClInclude Include="..\..\..\Common\rt api\HashAlgorithm.h" />
      <ClInclude Include="..\..\..\Common\rt api\HashRoutine.h" />

diff --combined Common/rt api/des_enc.c
index 75c2de543b538270ecfa7fa72aedf517ebcb2af0,8364c746d775e2b941059003f15df63b879a0dd2..f2c99b7d64d086728dd5664180f4b12ac1616c31
--- 1/Common/rt api/des_enc.c
--- 2/Common/rt api/des_enc.c
+++ b/Common/rt api/des_enc.c
@@@ -60,11 -60,9 +60,11 @@@
   */
  
  #include "des_locl.h"
- #include "spr.h"
+ //#include "spr.h"
  
  extern        const DES_LONG des_SPtrans[8][64];
 +
 +
  void des_encrypt1(DES_LONG *data, des_key_schedule ks, int enc)
  {
        register DES_LONG l,r,t,u;