From 971613510fc0d1791eed2aae469938afc9636958 Mon Sep 17 00:00:00 2001 From: Peter Kasting Date: Mon, 16 May 2016 14:30:12 -0700 Subject: [PATCH] Add #ifdef to guard against macro redefinition if this is included in another Google project that also defines this. --- snappy-stubs-public.h.in | 2 ++ 1 file changed, 2 insertions(+) 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.