From 18b1418b25deb291bf97dae8c6b19692ebe32a67 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Wed, 17 Sep 2014 22:09:21 +0000 Subject: [PATCH] Fixes common_unittests build. Original CL: https://breakpad.appspot.com/5704002/ A=gunsch@chromium.org R=gunsch@chromium.org Review URL: https://breakpad.appspot.com/8674002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1378 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/common/common.gyp | 3 +++ src/common/linux/google_crashdump_uploader.h | 5 +++++ src/common/linux/libcurl_wrapper.h | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/src/common/common.gyp b/src/common/common.gyp index 3c871509..47fadd8c 100644 --- a/src/common/common.gyp +++ b/src/common/common.gyp @@ -235,6 +235,9 @@ '../build/testing.gypi:gmock', '../build/testing.gypi:gtest', ], + 'libraries': [ + '-ldl', + ], }, ], } diff --git a/src/common/linux/google_crashdump_uploader.h b/src/common/linux/google_crashdump_uploader.h index 44901620..77048ae0 100644 --- a/src/common/linux/google_crashdump_uploader.h +++ b/src/common/linux/google_crashdump_uploader.h @@ -28,6 +28,9 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#ifndef COMMON_LINUX_GOOGLE_CRASHDUMP_UPLOADER_H_ +#define COMMON_LINUX_GOOGLE_CRASHDUMP_UPLOADER_H_ + #include #include @@ -98,3 +101,5 @@ class GoogleCrashdumpUploader { std::map parameters_; }; } + +#endif // COMMON_LINUX_GOOGLE_CRASHDUMP_UPLOADER_H_ diff --git a/src/common/linux/libcurl_wrapper.h b/src/common/linux/libcurl_wrapper.h index 3d46c2e6..b6786e44 100644 --- a/src/common/linux/libcurl_wrapper.h +++ b/src/common/linux/libcurl_wrapper.h @@ -30,6 +30,9 @@ // A wrapper for libcurl to do HTTP Uploads, to support easy mocking // and unit testing of the HTTPUpload class. +#ifndef COMMON_LINUX_LIBCURL_WRAPPER_H_ +#define COMMON_LINUX_LIBCURL_WRAPPER_H_ + #include #include @@ -83,3 +86,5 @@ class LibcurlWrapper { }; } + +#endif // COMMON_LINUX_LIBCURL_WRAPPER_H_