From 5297a2dc4b2f22c07b9bfd5aef6190efd51de0bb Mon Sep 17 00:00:00 2001 From: 雾聪 <wucong.lyb@alibaba-inc.com> Date: 星期四, 16 十一月 2023 11:12:45 +0800 Subject: [PATCH] Merge branch 'main' of https://github.com/alibaba-damo-academy/FunASR into main --- runtime/onnxruntime/third_party/glog/src/raw_logging.cc | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/runtime/onnxruntime/third_party/glog/src/raw_logging.cc b/runtime/onnxruntime/third_party/glog/src/raw_logging.cc index 8debc18..9e6cf17 100644 --- a/runtime/onnxruntime/third_party/glog/src/raw_logging.cc +++ b/runtime/onnxruntime/third_party/glog/src/raw_logging.cc @@ -39,14 +39,12 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> // for close() and write() #endif -#include <fcntl.h> // for open() - +#include <fcntl.h> // for open() #include <ctime> - -#include "base/commandlineflags.h" #include "config.h" -#include "glog/logging.h" // To pick up flag settings etc. -#include "glog/raw_logging.h" +#include <glog/logging.h> // To pick up flag settings etc. +#include <glog/raw_logging.h> +#include "base/commandlineflags.h" #ifdef HAVE_STACKTRACE # include "stacktrace.h" @@ -62,8 +60,7 @@ #endif #if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && \ - (!(defined(GLOG_OS_MACOSX)) && !(defined(GLOG_OS_OPENBSD))) && \ - !defined(GLOG_OS_EMSCRIPTEN) + (!(defined(GLOG_OS_MACOSX))) && !defined(GLOG_OS_EMSCRIPTEN) #define safe_write(fd, s, len) syscall(SYS_write, fd, s, len) #else // Not so safe, but what can you do? -- Gitblit v1.9.1