Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to build websockets #2693

Merged
merged 5 commits into from Jul 20, 2023
Merged

Add option to build websockets #2693

merged 5 commits into from Jul 20, 2023

Conversation

feiniks
Copy link
Contributor

@feiniks feiniks commented Jul 18, 2023

No description provided.

@@ -6640,7 +6640,7 @@ seaf_repo_manager_del_repo (SeafRepoManager *mgr,

pthread_rwlock_unlock (&mgr->priv->lock);

#if defined WIN32 || defined __APPLE__
#ifdef COMPILE_WS
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这样改的话会影响 windows 和 mac 上面的条件编译吧。应该把 COMPILE_WS 改为 COMPILE_LINUX_WS 然后条件编译改为 if defined WIN32 || defined APPLE || defined COMPILE_LINUX_WS。

if COMPILE_LINUX_WS
ws_src = notif-mgr.c
endif
endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里多了一个 endif?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里没多,在非MACOS的条件下,判断一下是否有COMPILE_LINUX_WS宏

@@ -6640,7 +6640,7 @@ seaf_repo_manager_del_repo (SeafRepoManager *mgr,

pthread_rwlock_unlock (&mgr->priv->lock);

#if defined WIN32 || defined __APPLE__
#if defined WIN32 || defined APPLE || defined COMPILE_LINUX_WS
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为什么从 APPLE 改为 APPLE 呢?

@killing killing merged commit 5b44209 into master Jul 20, 2023
@killing killing deleted the support_ws branch July 20, 2023 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants