From a9822c6c8aec0510724f26dd014d29965893710c Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 11 Feb 2015 00:46:45 +0300
Subject: [PATCH] platform: JNA updated to 4.1.0 (jna-utils -> jna-platform)

---
 build/gant.xml                                              | 2 +-
 lib/required_for_dist.txt                                   | 2 +-
 platform/bootstrap/src/com/intellij/idea/Main.java          | 6 +++---
 .../src/com/intellij/openapi/application/PathManager.java   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/gant.xml b/build/gant.xml
index 945df2558386..db611c2c56b1 100644
--- a/build/gant.xml
+++ b/build/gant.xml
@@ -41,7 +41,7 @@
        <include name="guava*.jar"/>
        <include name="picocontainer.jar"/>
        <include name="jna.jar"/>
-       <include name="jna-utils.jar"/>
+       <include name="jna-platform.jar"/>
        <include name="oromatcher.jar"/>
        <include name="snappy-in-java-*.jar"/>
        <include name="cli-parser-*.jar"/>
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 958621b9a1d8..e76d618abedf 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -30,8 +30,8 @@ jgoodies-common-1.2.1.jar
 jgoodies-forms.jar
 jgoodies-looks-2.4.2.jar
 jh.jar
-jna-utils.jar
 jna.jar
+jna-platform.jar
 jsch-0.1.52.jar
 jsch.agentproxy.connector-factory.jar
 jsch.agentproxy.core.jar
diff --git a/platform/bootstrap/src/com/intellij/idea/Main.java b/platform/bootstrap/src/com/intellij/idea/Main.java
index 09d96cd48ee6..556217939351 100644
--- a/platform/bootstrap/src/com/intellij/idea/Main.java
+++ b/platform/bootstrap/src/com/intellij/idea/Main.java
@@ -197,7 +197,7 @@ public class Main {
     // always delete previous patch copy
     File patchCopy = new File(tempDir, patchFileName + "_copy");
     File log4jCopy = new File(tempDir, "log4j.jar." + platform + "_copy");
-    File jnaUtilsCopy = new File(tempDir, "jna-utils.jar." + platform + "_copy");
+    File jnaUtilsCopy = new File(tempDir, "jna-platform.jar." + platform + "_copy");
     File jnaCopy = new File(tempDir, "jna.jar." + platform + "_copy");
     if (!FileUtilRt.delete(patchCopy) || !FileUtilRt.delete(log4jCopy) || !FileUtilRt.delete(jnaUtilsCopy) || !FileUtilRt.delete(jnaCopy)) {
       throw new IOException("Cannot delete temporary files in " + tempDir);
@@ -209,8 +209,8 @@ public class Main {
     File log4j = new File(PathManager.getLibPath(), "log4j.jar");
     if (!log4j.exists()) throw new IOException("Log4J is missing: " + log4j);
 
-    File jnaUtils = new File(PathManager.getLibPath(), "jna-utils.jar");
-    if (!jnaUtils.exists()) throw new IOException("jna-utils.jar is missing: " + jnaUtils);
+    File jnaUtils = new File(PathManager.getLibPath(), "jna-platform.jar");
+    if (!jnaUtils.exists()) throw new IOException("jna-platform.jar is missing: " + jnaUtils);
 
     File jna = new File(PathManager.getLibPath(), "jna.jar");
     if (!jna.exists()) throw new IOException("jna is missing: " + jna);
diff --git a/platform/util/src/com/intellij/openapi/application/PathManager.java b/platform/util/src/com/intellij/openapi/application/PathManager.java
index c897a1a0eaa0..b344c4568738 100644
--- a/platform/util/src/com/intellij/openapi/application/PathManager.java
+++ b/platform/util/src/com/intellij/openapi/application/PathManager.java
@@ -439,7 +439,7 @@ public class PathManager {
       THashSet.class,               // trove4j
       PicoContainer.class,          // PicoContainer
       TypeMapper.class,             // JNA
-      FileUtils.class,              // JNA (jna-utils)
+      FileUtils.class,              // JNA (jna-platform)
       PatternMatcher.class,          // OROMatcher
       Snappy.class                   // Snappy
     };