#include third_party/tensorflow/core/platform/macros.h

directly so we can drop it from port.h.
Change: 111621646

tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.h

@@ -26,6 +26,7 @@ limitations under the License.
 #include "tensorflow/core/common_runtime/gpu/visitable_allocator.h"
 #include "tensorflow/core/lib/gtl/stl_util.h"
 #include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/platform/thread_annotations.h"

tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h

@@ -23,6 +23,7 @@ limitations under the License.
 
 #include "tensorflow/stream_executor/stream_executor.h"
 #include "tensorflow/core/common_runtime/gpu/visitable_allocator.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 
 namespace tensorflow {

tensorflow/core/common_runtime/gpu/gpu_device.cc

@@ -48,6 +48,7 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/numbers.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/platform/tracing.h"
 #include "tensorflow/core/public/session_options.h"

tensorflow/core/common_runtime/gpu/gpu_region_allocator.h

@@ -25,6 +25,7 @@ limitations under the License.
 #include "tensorflow/core/common_runtime/gpu/gpu_allocator_retry.h"
 #include "tensorflow/core/common_runtime/gpu/visitable_allocator.h"
 #include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/platform/thread_annotations.h"

tensorflow/core/common_runtime/gpu/pool_allocator.h

@@ -27,6 +27,7 @@ limitations under the License.
 #include "tensorflow/core/common_runtime/gpu/visitable_allocator.h"
 #include "tensorflow/core/lib/core/bits.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mem.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/port.h"

tensorflow/core/lib/core/arena.cc

@@ -29,6 +29,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mem.h"
 
 namespace tensorflow {

tensorflow/core/lib/core/arena.h

@@ -23,6 +23,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 
 namespace tensorflow {

tensorflow/core/lib/core/arena_test.cc

@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/arena.h"
 
 #include <gtest/gtest.h>
+#include "tensorflow/core/platform/macros.h"
 
 namespace tensorflow {
 namespace core {

tensorflow/core/lib/core/command_line_flags.h

@@ -16,6 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LIB_CORE_COMMAND_LINE_FLAGS_H_
 #define TENSORFLOW_LIB_CORE_COMMAND_LINE_FLAGS_H_
 
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/public/status.h"
 

tensorflow/core/lib/core/errors.h

@@ -18,6 +18,7 @@ limitations under the License.
 
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/public/status.h"
 
 namespace tensorflow {

tensorflow/core/lib/core/threadpool.h

@@ -20,6 +20,7 @@ limitations under the License.
 #include <functional>
 #include <thread>
 #include <vector>
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/public/env.h"

tensorflow/core/lib/gtl/array_slice_test.cc

@@ -23,6 +23,7 @@ limitations under the License.
 #include <gtest/gtest.h>
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
 #include "tensorflow/core/lib/gtl/stl_util.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 
 namespace tensorflow {

tensorflow/core/lib/gtl/inlined_vector_test.cc

@@ -22,6 +22,7 @@ limitations under the License.
 
 #include <gtest/gtest.h>
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/platform/test_benchmark.h"
 

tensorflow/core/lib/gtl/int_type.h

@@ -158,6 +158,7 @@ limitations under the License.
 #include <ostream>  // NOLINT
 #include <unordered_map>
 
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 
 namespace tensorflow {

tensorflow/core/lib/gtl/iterator_range_test.cc

@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <vector>
 #include <gtest/gtest.h>
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 
 namespace tensorflow {

tensorflow/core/lib/gtl/manual_constructor.h

@@ -29,6 +29,7 @@ limitations under the License.
 #include <new>
 #include <utility>
 
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mem.h"  // For aligned_malloc/aligned_free
 
 namespace tensorflow {

tensorflow/core/lib/strings/numbers.cc

@@ -22,6 +22,7 @@ limitations under the License.
 #include <cmath>
 
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 
 namespace tensorflow {

tensorflow/core/lib/strings/ordered_code.h

@@ -39,6 +39,7 @@ limitations under the License.
 #define TENSORFLOW_LIB_STRINGS_ORDERED_CODE_H__
 
 #include <string>
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 
 namespace tensorflow {

tensorflow/core/lib/strings/strcat.h

@@ -24,6 +24,7 @@ limitations under the License.
 
 #include "tensorflow/core/lib/core/stringpiece.h"
 #include "tensorflow/core/lib/strings/numbers.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 
 // The AlphaNum type was designed to be used as the parameter type for StrCat().

tensorflow/core/lib/strings/stringprintf.h

@@ -27,6 +27,7 @@ limitations under the License.
 #include <string>
 #include <vector>
 
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 
 namespace tensorflow {

tensorflow/core/util/bcast.h

@@ -19,6 +19,7 @@ limitations under the License.
 #include <algorithm>
 #include <vector>
 
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 
 #include "tensorflow/core/lib/gtl/inlined_vector.h"

tensorflow/core/util/events_writer.h

@@ -19,6 +19,7 @@ limitations under the License.
 #include <memory>
 #include <string>
 #include "tensorflow/core/lib/io/record_writer.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/public/env.h"
 #include "tensorflow/core/util/event.pb.h"

tensorflow/core/util/guarded_philox_random.h

@@ -18,6 +18,7 @@ limitations under the License.
 
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/lib/random/philox_random.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/port.h"
 

tensorflow/core/util/tensor_slice_reader.h

@@ -27,6 +27,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/stringpiece.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/platform/protobuf.h"

tensorflow/core/util/tensor_slice_writer.h

@@ -28,6 +28,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/stringpiece.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/public/status.h"
 #include "tensorflow/core/public/tensor_shape.h"