Merge PR#712 (Add test for passing GCHandle ptr via pinvoke)

Conflicts: Tests/EmscriptenTestCases/PassPtrToPinnedArray.cs Tests/Tests.csproj
sq · Apr 8, 2015 · 7cae3ee · 7cae3ee
2 parents ba9fc6b + 3a47d5a
commit 7cae3ee
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -145,6 +145,7 @@
     <None Include="EmscriptenTestCases\GetDelegateForFunctionPointer.cs" />
     <None Include="EmscriptenTestCases\StaticStringFromIntPtr.cs" />
     <None Include="EmscriptenTestCases\OutStructArrayParameter.cs" />
+    <None Include="EmscriptenTestCases\PassPtrToPinnedArray.cs" />
     <None Include="AnalysisTestCases\Issue696.cs" />
     <None Include="EmscriptenTestCases\EnumRoundTrip.cs" />
     <Compile Include="EmscriptenTestCases\ProxiedExternFunction.cs" />
@@ -686,4 +687,4 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="..\.NET 4.5.targets" />
-</Project>
+</Project>