summaryrefslogtreecommitdiff
path: root/src/os_unix.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-02-26 14:56:42 +0100
committerBram Moolenaar <Bram@vim.org>2013-02-26 14:56:42 +0100
commit693e40c2cdb65f19febde5664633ac465931cc63 (patch)
tree3c4ece28adb6806f3809f954ea134cd759b54ee5 /src/os_unix.c
parent53eb37e9f9dfba51092f72553d79d3bb677a336b (diff)
downloadvim-git-693e40c2cdb65f19febde5664633ac465931cc63.tar.gz
updated for version 7.3.836v7.3.836
Problem: Clipboard does not work on Win32 when compiled with Cygwin. Solution: Move the Win32 clipboard code to a separate file and use it when building with os_unix.c. (Frodak Baksik, Ken Takata)
Diffstat (limited to 'src/os_unix.c')
-rw-r--r--src/os_unix.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index c82e593f3..bb97bbe6b 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -61,6 +61,11 @@ static int selinux_enabled = -1;
# include <cygwin/version.h>
# include <sys/cygwin.h> /* for cygwin_conv_to_posix_path() and/or
* for cygwin_conv_path() */
+# ifdef FEAT_CYGWIN_WIN32_CLIPBOARD
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+# include "winclip.pro"
+# endif
# endif
#endif
@@ -1223,6 +1228,9 @@ mch_init()
#ifdef MACOS_CONVERT
mac_conv_init();
#endif
+#ifdef FEAT_CYGWIN_WIN32_CLIPBOARD
+ win_clip_init();
+#endif
}
static void