From fb3f4f606659af9cbf10b0b6710fb80fcaec5627 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 18 一月 2021 10:46:44 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
include/usgcommon/usg_typedef.h | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/usgcommon/usg_typedef.h b/include/usgcommon/usg_typedef.h
index 55796e1..f5d4b5b 100644
--- a/include/usgcommon/usg_typedef.h
+++ b/include/usgcommon/usg_typedef.h
@@ -5,10 +5,6 @@
extern "C" {
#endif
-/// @brief Compare And Swap
-/// If the current value of *a_ptr is a_oldVal, then write a_newVal into *a_ptr
-/// @return true if the comparison is successful and a_newVal was written
-#define CAS(a_ptr, a_oldVal, a_newVal) __sync_bool_compare_and_swap(a_ptr, a_oldVal, a_newVal)
#if ! defined(__FreeBSD__) && ! defined(__OpenBSD__) && \
! defined(__sgi) && ! defined(__APPLE__)
@@ -25,6 +21,11 @@
#endif
+#ifdef _WIN32
+#define PATH_SEPERATOR "\\"
+#else
+#define PATH_SEPERATOR "/"
+#endif
/* Default file permissions are DEF_MODE & ~DEF_UMASK */
#define DEF_MODE S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH
@@ -43,7 +44,7 @@
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
+#define BLANK "\t\n\v\f\r "
/* Misc constants */
#define MAXLINE 1024 /* Max text line length */
#define MAXBUF 8192 /* Max I/O buffer size */
--
Gitblit v1.8.0