LibCore: compile puff.c as a separate object

akimdi · Dec 25, 2019 · 2aeae2a · 2aeae2a
1 parent 0343be3
commit 2aeae2a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Libraries/LibCore/CGzip.cpp b/Libraries/LibCore/CGzip.cpp
@@ -2,7 +2,6 @@
 #include <AK/ByteBuffer.h>
 #include <AK/Optional.h>
 #include <LibCore/puff.h>
-#include <LibCore/puff.c>
 #include <limits.h>
 #include <stddef.h>
 

diff --git a/Libraries/LibCore/Makefile b/Libraries/LibCore/Makefile
@@ -22,7 +22,8 @@ OBJS = \
  CProcessStatisticsReader.o \
  CDirIterator.o \
  CUserInfo.o \
- CGzip.o
+ CGzip.o \
+ puff.o
 
 LIBRARY = libcore.a
 

diff --git a/Libraries/LibCore/puff.h b/Libraries/LibCore/puff.h
@@ -21,6 +21,10 @@
  Mark Adler [email protected]
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * See puff.c for purpose and usage.
  */
@@ -32,3 +36,7 @@ int puff(unsigned char* dest, /* pointer to destination pointer */
  unsigned long* destlen, /* amount of output space */
  const unsigned char* source, /* pointer to source data pointer */
  unsigned long* sourcelen); /* amount of input available */
+
+#ifdef __cplusplus
+}
+#endif