On 14-Jun-2019 19:37, Bram Moolenaar wrote:
Patch 8.1.1531
Problem: Clipboard type name is inconsistent.
Solution: Rename VimClipboard to Clipboard_T.
Files: src/gui_gtk_x11.c, src/proto/gui_gtk_x11.pro, src/gui_mac.c,
src/proto/gui_mac.pro, src/gui_x11.c, src/proto/gui_x11.pro,
src/ops.c, src/proto/ops.pro, src/os_qnx.c, src/proto/os_qnx.pro,
src/os_unix.c, src/proto/os_unix.pro, src/ui.c, src/proto/ui.pro,
src/winclip.c, src/proto/winclip.pro, src/globals.h, src/proto.h
After this patch, mingw64 (gcc 9.1.1) spews a bunch of errors. Here is a
sample:
<snip>
gcc -c -I. -Iproto -DWIN32 -DWINVER=0x0603 -D_WIN32_WINNT=0x0603
-DHAVE_PATHDEF -DFEAT_NORMAL -DHAVE_STDINT_H -DFEAT_GUI_MSWIN -DFEA
T_CLIPBOARD -pipe -march=native -Wall -O3 -fomit-frame-pointer
-freg-struct-return crypt.c -o gobjnative/crypt.o
In file included from proto.h:44,
from vim.h:2084,
from crypt.c:13:
proto/winclip.pro:7:28: error: unknown type name 'Clipboard_T'
7 | int clip_mch_own_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/winclip.pro:8:30: error: unknown type name 'Clipboard_T'
8 | void clip_mch_lose_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/winclip.pro:9:33: error: unknown type name 'Clipboard_T'
9 | void clip_mch_request_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/winclip.pro:10:29: error: unknown type name 'Clipboard_T'
10 | void clip_mch_set_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
In file included from proto.h:171,
from vim.h:2084,
from crypt.c:13:
proto/ops.pro:56:26: error: unknown type name 'Clipboard_T'
56 | void clip_free_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ops.pro:57:25: error: unknown type name 'Clipboard_T'
57 | void clip_get_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ops.pro:58:59: error: unknown type name 'Clipboard_T'
58 | void clip_yank_selection(int type, char_u *str, long len,
Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ops.pro:59:55: error: unknown type name 'Clipboard_T'
59 | int clip_convert_selection(char_u **str, long_u *len,
Clipboard_T *cbd);
| ^~~~~~~~~~~
In file included from proto.h:202,
from vim.h:2084,
from crypt.c:13:
proto/ui.pro:18:28: error: unknown type name 'Clipboard_T'
18 | void clip_update_selection(Clipboard_T *clip);
| ^~~~~~~~~~~
proto/ui.pro:19:25: error: unknown type name 'Clipboard_T'
19 | void clip_own_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:20:26: error: unknown type name 'Clipboard_T'
20 | void clip_lose_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:31:27: error: unknown type name 'Clipboard_T'
31 | void clip_clear_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:35:28: error: unknown type name 'Clipboard_T'
35 | int clip_gen_own_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:36:30: error: unknown type name 'Clipboard_T'
36 | void clip_gen_lose_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:37:29: error: unknown type name 'Clipboard_T'
37 | void clip_gen_set_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:38:33: error: unknown type name 'Clipboard_T'
38 | void clip_gen_request_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:39:27: error: unknown type name 'Clipboard_T'
39 | int clip_gen_owner_exists(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:60:63: error: unknown type name 'Clipboard_T'
60 | void clip_x11_request_selection(Widget myShell, Display *dpy,
Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:61:46: error: unknown type name 'Clipboard_T'
61 | void clip_x11_lose_selection(Widget myShell, Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:62:44: error: unknown type name 'Clipboard_T'
62 | int clip_x11_own_selection(Widget myShell, Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:63:29: error: unknown type name 'Clipboard_T'
63 | void clip_x11_set_selection(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:64:27: error: unknown type name 'Clipboard_T'
64 | int clip_x11_owner_exists(Clipboard_T *cbd);
| ^~~~~~~~~~~
proto/ui.pro:65:37: error: unknown type name 'Clipboard_T'
65 | void yank_cut_buffer0(Display *dpy, Clipboard_T *cbd);
| ^~~~~~~~~~~
In file included from vim.h:2131,
from crypt.c:13:
globals.h:548:8: error: unknown type name 'Clipboard_T'
548 | EXTERN Clipboard_T clip_star; // PRIMARY selection in X11
| ^~~~~~~~~~~
</snip>
Please check the attached patch.
Cheers
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/e3930575-4ab4-d85b-66ee-0aab5ebd86e9%40internode.on.net.
For more options, visit https://groups.google.com/d/optout.
--- vim.h.orig 2019-06-15 04:43:55.996442400 +1000
+++ vim.h 2019-06-15 06:41:22.923858600 +1000
@@ -2006,7 +2006,7 @@
# endif
/* Info about selected text */
-typedef struct VimClipboard
+typedef struct Clipboard_T
{
int available; /* Is clipboard available? */
int owned; /* Flag: do we own the selection? */
@@ -2037,9 +2037,9 @@
int_u format; /* Vim's own special clipboard format */
int_u format_raw; /* Vim's raw text clipboard format */
# endif
-} VimClipboard;
+} Clipboard_T;
#else
-typedef int VimClipboard; /* This is required for the prototypes. */
+typedef int Clipboard_T; /* This is required for the prototypes. */
#endif
/* Use 64-bit stat structure if available. */
