diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-23 19:11:32 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-23 19:11:32 +0000 |
| commit | 44a8ce5795d47bdea2f7f09d424fc48d73e760b0 (patch) | |
| tree | 806da73df124e36a9d5142a6d2e5d79b3140908f /typedefs.h | |
| parent | 84c148523e87430874098c0b6e86ebec26c004d6 (diff) | |
| download | webrtc-44a8ce5795d47bdea2f7f09d424fc48d73e760b0.tar.gz | |
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
Diffstat (limited to 'typedefs.h')
| -rw-r--r-- | typedefs.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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_ |