From 2aeae2aea9a289e3e9ba96444e44169dd78cc1cb Mon Sep 17 00:00:00 2001 From: joshua stein Date: Tue, 24 Dec 2019 15:41:17 -0600 Subject: [PATCH] LibCore: compile puff.c as a separate object --- Libraries/LibCore/CGzip.cpp | 1 - Libraries/LibCore/Makefile | 3 ++- Libraries/LibCore/puff.h | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Libraries/LibCore/CGzip.cpp b/Libraries/LibCore/CGzip.cpp index 4b0f76c9b0..0f6db98d63 100644 --- a/Libraries/LibCore/CGzip.cpp +++ b/Libraries/LibCore/CGzip.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include diff --git a/Libraries/LibCore/Makefile b/Libraries/LibCore/Makefile index b052d19a08..47945efd13 100644 --- 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 index 50beef92a1..f778ea319a 100644 --- a/Libraries/LibCore/puff.h +++ b/Libraries/LibCore/puff.h @@ -21,6 +21,10 @@ Mark Adler madler@alumni.caltech.edu */ +#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