From d80ac2fd2df4e7fb8a28acfa512bb11472b5cc99 Mon Sep 17 00:00:00 2001
From: liugz18 <57401541+liugz18@users.noreply.github.com>
Date: 星期四, 18 七月 2024 21:34:55 +0800
Subject: [PATCH] Rename 'res' in line 514 to avoid with naming conflict with line 365

---
 runtime/onnxruntime/third_party/glog/src/glog/export.h |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/runtime/onnxruntime/third_party/glog/src/glog/export.h b/runtime/onnxruntime/third_party/glog/src/glog/export.h
new file mode 100644
index 0000000..6e2691e
--- /dev/null
+++ b/runtime/onnxruntime/third_party/glog/src/glog/export.h
@@ -0,0 +1,42 @@
+
+#ifndef GLOG_EXPORT_H
+#define GLOG_EXPORT_H
+
+#ifdef GLOG_STATIC_DEFINE
+#  define GLOG_EXPORT
+#  define GLOG_NO_EXPORT
+#else
+#  ifndef GLOG_EXPORT
+#    ifdef GOOGLE_GLOG_IS_A_DLL
+        /* We are building this library */
+#      define GLOG_EXPORT __attribute__((visibility("default")))
+#    else
+        /* We are using this library */
+#      define GLOG_EXPORT __attribute__((visibility("default")))
+#    endif
+#  endif
+
+#  ifndef GLOG_NO_EXPORT
+#    define GLOG_NO_EXPORT __attribute__((visibility("hidden")))
+#  endif
+#endif
+
+#ifndef GLOG_DEPRECATED
+#  define GLOG_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#ifndef GLOG_DEPRECATED_EXPORT
+#  define GLOG_DEPRECATED_EXPORT GLOG_EXPORT GLOG_DEPRECATED
+#endif
+
+#ifndef GLOG_DEPRECATED_NO_EXPORT
+#  define GLOG_DEPRECATED_NO_EXPORT GLOG_NO_EXPORT GLOG_DEPRECATED
+#endif
+
+#if 0 /* DEFINE_NO_DEPRECATED */
+#  ifndef GLOG_NO_DEPRECATED
+#    define GLOG_NO_DEPRECATED
+#  endif
+#endif
+
+#endif /* GLOG_EXPORT_H */

--
Gitblit v1.9.1