Skip to content

Commit fc51122

Browse files
account for HAVE_FSEVENTS being defined via watchman_system.h
Summary: as dtolnay pointed out on D80902289, its possible for HAVE_FSEVENTS to be defined in `watchman/watchman_cmd.h` - so move that above the directive. Reviewed By: MichaelCuevas Differential Revision: D80910787 fbshipit-source-id: 506b7e54c4117009b85ae569016efd9501d9e500
1 parent f2f6f82 commit fc51122

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

watchman/watcher/fsevents.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
#include "watchman/watchman_cmd.h" // @donotremove
9+
810
#if HAVE_FSEVENTS
911

1012
#include <folly/String.h>
@@ -19,7 +21,6 @@
1921
#include "watchman/LogConfig.h"
2022
#include "watchman/fs/Pipe.h"
2123
#include "watchman/watcher/WatcherRegistry.h"
22-
#include "watchman/watchman_cmd.h"
2324

2425
#include "watchman/watcher/fsevents.h"
2526

watchman/watcher/kqueue_and_fsevents.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
#include "watchman/watchman_cmd.h" // @donotremove
9+
810
#if HAVE_FSEVENTS && defined(HAVE_KQUEUE)
911

1012
#include <folly/Synchronized.h>
@@ -16,7 +18,6 @@
1618
#include "watchman/watcher/WatcherRegistry.h"
1719
#include "watchman/watcher/fsevents.h"
1820
#include "watchman/watcher/kqueue.h"
19-
#include "watchman/watchman_cmd.h"
2021
#include "watchman/watchman_file.h"
2122

2223
namespace watchman {

0 commit comments

Comments
 (0)