From 44a8ce5795d47bdea2f7f09d424fc48d73e760b0 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 23 Oct 2013 19:11:32 +0000 Subject: Check if WARN_UNUSED_RESULT and COMPILE_ASSERT are defined. Works around a multiple definition error from webrtc and libjingle. Corresponds to the libjingle change here: https://critique.corp.google.com/#review/55489575-p10 TESTED=trybots R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2809004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5025 4adac7df-926f-26a2-2b94-8c16560cd09d --- typedefs.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'typedefs.h') diff --git a/typedefs.h b/typedefs.h index dc206f29..35ccde48 100644 --- a/typedefs.h +++ b/typedefs.h @@ -95,10 +95,14 @@ typedef unsigned __int64 uint64_t; // Annotate a function indicating the caller must examine the return value. // Use like: // int foo() WARN_UNUSED_RESULT; +// TODO(ajm): Hack to avoid multiple definitions until the base/ of webrtc and +// libjingle are merged. +#if !defined(WARN_UNUSED_RESULT) #if defined(__GNUC__) #define WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #else #define WARN_UNUSED_RESULT #endif +#endif // WARN_UNUSED_RESULT #endif // WEBRTC_TYPEDEFS_H_ -- cgit v1.2.3