From 09354db1434859a31a3c81abebcc4018d42f2715 Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Tue, 18 Jul 2017 15:38:30 -0700
Subject: Merge from Google internal for 3.4 release

---
 src/google/protobuf/wire_format.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/google/protobuf/wire_format.h')

diff --git a/src/google/protobuf/wire_format.h b/src/google/protobuf/wire_format.h
index 5e9aca52..01ee1337 100644
--- a/src/google/protobuf/wire_format.h
+++ b/src/google/protobuf/wire_format.h
@@ -46,11 +46,6 @@
 #include <google/protobuf/message.h>
 #include <google/protobuf/wire_format_lite.h>
 
-// Do UTF-8 validation on string type in Debug build only
-#ifndef NDEBUG
-#define GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-#endif
-
 namespace google {
 namespace protobuf {
   namespace io {
-- 
cgit v1.2.3