| Index: third_party/grpc/src/core/support/wrap_memcpy.c
|
| diff --git a/third_party/WebKit/Source/core/page/PagePopup.h b/third_party/grpc/src/core/support/wrap_memcpy.c
|
| similarity index 72%
|
| copy from third_party/WebKit/Source/core/page/PagePopup.h
|
| copy to third_party/grpc/src/core/support/wrap_memcpy.c
|
| index 1f6583187d90a45c516e5e729d4c92a4e1037a5a..15c289f7b8bb410b1b48296f6495e7081d5115b0 100644
|
| --- a/third_party/WebKit/Source/core/page/PagePopup.h
|
| +++ b/third_party/grpc/src/core/support/wrap_memcpy.c
|
| @@ -1,5 +1,7 @@
|
| /*
|
| - * Copyright (C) 2012 Google Inc. All rights reserved.
|
| + *
|
| + * Copyright 2016, Google Inc.
|
| + * All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are
|
| @@ -26,29 +28,26 @@
|
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + *
|
| */
|
|
|
| -#ifndef PagePopup_h
|
| -#define PagePopup_h
|
| -
|
| -#include "wtf/Forward.h"
|
| -
|
| -namespace blink {
|
| -
|
| -class AXObject;
|
| -class IntRect;
|
| +#include <string.h>
|
|
|
| -// A PagePopup object is created by ChromeClient::openPagePopup(), and deleted
|
| -// by ChromeClient::closePagePopup().
|
| -class PagePopup {
|
| -public:
|
| - virtual AXObject* rootAXObject() = 0;
|
| - virtual void setWindowRect(const IntRect&) = 0;
|
| - virtual void postMessage(const String& message) = 0;
|
| -
|
| -protected:
|
| - virtual ~PagePopup() { }
|
| -};
|
| +/* Provide a wrapped memcpy for targets that need to be backwards
|
| + * compatible with older libc's.
|
| + *
|
| + * Enable by setting LDFLAGS=-Wl,-wrap,memcpy when linking.
|
| + */
|
|
|
| -} // namespace blink
|
| +#ifdef __linux__
|
| +#ifdef __x86_64__
|
| +__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
|
| +void *__wrap_memcpy(void *destination, const void *source, size_t num) {
|
| + return memcpy(destination, source, num);
|
| +}
|
| +#else /* !__x86_64__ */
|
| +void *__wrap_memcpy(void *destination, const void *source, size_t num) {
|
| + return memmove(destination, source, num);
|
| +}
|
| +#endif
|
| #endif
|
|
|