From b192c86ba43b3b762e705f4cdd509da3250e1c0c Mon Sep 17 00:00:00 2001
From: Bing Xu <bingxu@fb.com>
Date: Mon, 26 Nov 2018 11:30:15 -0800
Subject: [amalgamation] lz4frame.c

---
 lib/README.md  | 13 +++++++++++++
 lib/lz4frame.c |  7 +++++++
 tests/Makefile |  1 +
 3 files changed, 21 insertions(+)

diff --git a/lib/README.md b/lib/README.md
index 8b3b424..e3fdbf3 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -42,6 +42,19 @@ Should they be nonetheless needed, it's possible to force their publication
 by using build macro `LZ4_PUBLISH_STATIC_FUNCTIONS`.
 
 
+#### Amalgamation
+
+lz4 code is able to be amalgamated into a single file.
+We can combine all source code in `lz4_all.c` by using following command, 
+```
+cat lz4.c > lz4_all.c
+cat lz4hc.c >> lz4_all.c
+cat lz4frame.c >> lz4_all.c
+```
+and compile `lz4_all.c`.
+It's necessary to include all `*.h` files present in `/lib` together with `lz4_all.c`.
+
+
 #### Windows : using MinGW+MSYS to create DLL
 
 DLL can be created using MinGW+MSYS with the `make liblz4` command.
diff --git a/lib/lz4frame.c b/lib/lz4frame.c
index 357f962..705832d 100644
--- a/lib/lz4frame.c
+++ b/lib/lz4frame.c
@@ -64,10 +64,15 @@ You can contact the author at :
 **************************************/
 #include <stdlib.h>   /* malloc, calloc, free */
 #define ALLOC(s)       malloc(s)
+#ifndef LZ4_SRC_INCLUDED
 #define ALLOC_AND_ZERO(s)  calloc(1,(s))
+#endif
 #define FREEMEM(p)     free(p)
 #include <string.h>   /* memset, memcpy, memmove */
+#ifndef LZ4_SRC_INCLUDED
 #define MEM_INIT       memset
+#endif
+
 
 
 /*-************************************
@@ -180,9 +185,11 @@ static void LZ4F_writeLE64 (void* dst, U64 value64)
 /*-************************************
 *  Constants
 **************************************/
+#ifndef LZ4_SRC_INCLUDED
 #define KB *(1<<10)
 #define MB *(1<<20)
 #define GB *(1<<30)
+#endif
 
 #define _1BIT  0x01
 #define _2BITS 0x03
diff --git a/tests/Makefile b/tests/Makefile
index 24dc581..8dcef6d 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -160,6 +160,7 @@ test32: test
 test-amalgamation: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c
 	cat $(LZ4DIR)/lz4.c > lz4_all.c
 	cat $(LZ4DIR)/lz4hc.c >> lz4_all.c
+	cat $(LZ4DIR)/lz4frame.c >> lz4_all.c
 	$(CC) -I$(LZ4DIR) -c lz4_all.c
 	$(RM) lz4_all.c
 
-- 
cgit v0.12