From c1411a6af6eb64d32a6ad66ad60958647d7a8d00 Mon Sep 17 00:00:00 2001
From: Moinak Ghosh <moinakg@gmail.com>
Date: Thu, 24 Jul 2014 23:48:42 +0530
Subject: [PATCH] More whitespace cleanup and MPLv2 licensing support.

---
 README.md                 | 4 ++--
 adaptive_compress.c       | 4 ++++
 crypto/aes/aesni-x86_64.s | 2 +-
 pcompress.c               | 4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7e0f028..866850f 100644
--- a/README.md
+++ b/README.md
@@ -326,10 +326,10 @@ Advanced usage
                 from the temp file and actual deduplication is performed. This allows the
                 in-memory index size to be approximately 0.0025% of the total dataset size and
                 requires very few disk reads for every 2048 blocks processed.
-                  
+
                 In pipe mode Global Deduplication always uses a segmented similarity based
                 index. It allows efficient network transfer of large data.
-                  
+
        -B <0..5>
                 Specify an average Dedupe block size. 0 - 2K, 1 - 4K, 2 - 8K ... 5 - 64K.
                 Default deduplication block size is 4KB for Global Deduplication and 2KB
diff --git a/adaptive_compress.c b/adaptive_compress.c
index 4ef924a..26d19c4 100644
--- a/adaptive_compress.c
+++ b/adaptive_compress.c
@@ -129,8 +129,12 @@ adapt_props(algo_props_t *data, int level, uint64_t chunksize)
 	data->delta2_span = 200;
 	data->deltac_min_distance = EIGHTM;
 	ext1 = lz4_buf_extra(chunksize);
+
+#ifdef ENABLE_PC_LIBBSC
 	ext2 = libbsc_buf_extra(chunksize);
 	if (ext2 > ext1) ext1 = ext2;
+#endif
+
 	data->buf_extra = ext1;
 }
 
diff --git a/crypto/aes/aesni-x86_64.s b/crypto/aes/aesni-x86_64.s
index 272483c..ec4e87f 100644
--- a/crypto/aes/aesni-x86_64.s
+++ b/crypto/aes/aesni-x86_64.s
@@ -20,7 +20,7 @@
 ;# If not, see <http://www.gnu.org/licenses/>.
 ;#
 ;# moinakg@belenix.org, http://moinakg.wordpress.com/
-;#      
+;#
 
 ;#
 ;# NOTE:
diff --git a/pcompress.c b/pcompress.c
index c21b9f5..6a9d397 100644
--- a/pcompress.c
+++ b/pcompress.c
@@ -43,7 +43,11 @@
 #include <pcompress.h>
 #include <allocator.h>
 #include <rabin_dedup.h>
+
+#ifndef _MPLV2_LICENSE_
 #include <lzp.h>
+#endif
+
 #include <transpose.h>
 #include <delta2/delta2.h>
 #include <crypto/crypto_utils.h>