diff options
| author | Peter Kasting <pkasting@chromium.org> | 2016-05-16 14:30:12 -0700 |
|---|---|---|
| committer | Steinar H. Gunderson <sesse@google.com> | 2016-05-20 11:35:25 +0200 |
| commit | 971613510fc0d1791eed2aae469938afc9636958 (patch) | |
| tree | d07350cb1128750de9f24d9bb254a84fcf8a79d4 | |
| parent | 0000f997dd65aabc8eb8ac0c1461e9c4f6c240d3 (diff) | |
| download | snappy-971613510fc0d1791eed2aae469938afc9636958.tar.gz snappy-971613510fc0d1791eed2aae469938afc9636958.tar.bz2 snappy-971613510fc0d1791eed2aae469938afc9636958.zip | |
Add #ifdef to guard against macro redefinition if this is included in another
Google project that also defines this.
| -rw-r--r-- | snappy-stubs-public.h.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/snappy-stubs-public.h.in b/snappy-stubs-public.h.in index ebe676c..96989ac 100644 --- a/snappy-stubs-public.h.in +++ b/snappy-stubs-public.h.in @@ -80,9 +80,11 @@ typedef unsigned long long uint64; typedef std::string string; +#ifndef DISALLOW_COPY_AND_ASSIGN #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ TypeName(const TypeName&); \ void operator=(const TypeName&) +#endif #if !@ac_cv_have_sys_uio_h@ // Windows does not have an iovec type, yet the concept is universally useful. |