From 7e288d3bc38f4b662f8fa567d7c6b8879fae15a8 Mon Sep 17 00:00:00 2001 From: Kazuki Sakamoto Date: Tue, 31 Oct 2017 21:38:01 -0700 Subject: [PATCH] Merge duplicated proto Fix #575 --- src/proto.h | 3 +++ src/proto/os_macosx.pro | 13 ------------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 src/proto/os_macosx.pro diff --git a/src/proto.h b/src/proto.h index b4f544073d..1352389df3 100644 --- a/src/proto.h +++ b/src/proto.h @@ -296,6 +296,9 @@ int clip_mch_own_selection(VimClipboard *cbd); void clip_mch_request_selection(VimClipboard *cbd); void clip_mch_set_selection(VimClipboard *cbd); #endif +#if defined(MACOS_X) && defined(FEAT_GUI) +void macosx_fork(); +#endif #ifdef __BORLANDC__ # define _PROTO_H diff --git a/src/proto/os_macosx.pro b/src/proto/os_macosx.pro deleted file mode 100644 index a14667c4f4..0000000000 --- a/src/proto/os_macosx.pro +++ /dev/null @@ -1,13 +0,0 @@ -/* os_macosx.pro */ -/* functions in os_macosx.m */ - -#if defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI) -void clip_mch_lose_selection(VimClipboard *cbd); -int clip_mch_own_selection(VimClipboard *cbd); -void clip_mch_request_selection(VimClipboard *cbd); -void clip_mch_set_selection(VimClipboard *cbd); -#endif - -void macosx_fork(void); - -/* vim: set ft=c : */