tyler.durden
/
snappy-java
mirror of https://github.com/xerial/snappy-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.0.5-M2'

This commit is contained in:
Taro L. Saito 2012-09-27 12:22:09 +09:00
parent 7b2546911b 70b292d0f9
commit 76166832ee
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.xerial.snappy</groupId> <groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId> <artifactId>snappy-java</artifactId>
<version>1.0.5-M1</version> <version>1.0.5-M2</version>
<name>Snappy for Java</name> <name>Snappy for Java</name>
<description>snappy-java: A fast compression/decompression library</description> <description>snappy-java: A fast compression/decompression library</description>
<packaging>bundle</packaging> <packaging>bundle</packaging>

5
src/main/java/org/xerial/snappy/OSInfo.java
View File

@ -77,7 +77,10 @@ public class OSInfo
catch (InterruptedException e) { catch (InterruptedException e) {
// ignored: fall back to "arm" arch (soft-float ABI) // ignored: fall back to "arm" arch (soft-float ABI)
} }
} }
else if(getOSName().equals("Mac") && osArch.equals("universal")) {
return "x86_64"; // Fix for openjdk7
}
return translateArchNameToFolderName(osArch); return translateArchNameToFolderName(osArch);
} }