commit 971613510fc0d1791eed2aae469938afc9636958
author Peter Kasting <pkasting@chromium.org> Mon May 16 14:30:12 2016 -0700
committer Steinar H. Gunderson <sesse@google.com> Fri May 20 11:35:25 2016 +0200
tree d07350cb1128750de9f24d9bb254a84fcf8a79d4
parent 0000f997dd65aabc8eb8ac0c1461e9c4f6c240d3

Add #ifdef to guard against macro redefinition if this is included in another
Google project that also defines this.

snappy-stubs-public.h.in

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 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.