HADOOP-9481. Merge r1481191 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489239 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
620c7fe36f
commit
198cb3ebdd
|
@ -207,6 +207,9 @@ Release 2.1.0-beta - UNRELEASED
|
|||
(which in turn throws SIGABRT) causing client crashes. (Colin Patrick
|
||||
McCabe via atm)
|
||||
|
||||
HADOOP-9481. Broken conditional logic with HADOOP_SNAPPY_LIBRARY. (Vadim
|
||||
Bondarev via atm)
|
||||
|
||||
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
|
||||
|
||||
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
|
||||
|
|
|
@ -17,6 +17,8 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "org_apache_hadoop_io_compress_snappy.h"
|
||||
|
||||
#if defined HADOOP_SNAPPY_LIBRARY
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -28,7 +30,6 @@
|
|||
#include "config.h"
|
||||
#endif // UNIX
|
||||
|
||||
#include "org_apache_hadoop_io_compress_snappy.h"
|
||||
#include "org_apache_hadoop_io_compress_snappy_SnappyCompressor.h"
|
||||
|
||||
#define JINT_MAX 0x7fffffff
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "org_apache_hadoop_io_compress_snappy.h"
|
||||
|
||||
#if defined HADOOP_SNAPPY_LIBRARY
|
||||
|
||||
|
@ -24,11 +25,10 @@
|
|||
#include <string.h>
|
||||
|
||||
#ifdef UNIX
|
||||
#include "config.h"
|
||||
#include <dlfcn.h>
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "org_apache_hadoop_io_compress_snappy.h"
|
||||
#include "org_apache_hadoop_io_compress_snappy_SnappyDecompressor.h"
|
||||
|
||||
static jfieldID SnappyDecompressor_clazz;
|
||||
|
|
Loading…
Reference in New Issue