1 To: vim_dev@googlegroups.com
2 Subject: Patch 8.0.0123
4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
11 Problem: Modern Sun compilers define "__sun" instead of "sun".
12 Solution: Use __sun. (closes #1296)
13 Files: src/mbyte.c, src/pty.c, src/os_unixx.h, src/vim.h
16 *** ../vim-8.0.0122/src/mbyte.c 2016-08-29 22:42:20.000000000 +0200
17 --- src/mbyte.c 2016-12-03 16:28:33.069347623 +0100
22 #if defined(FEAT_GUI_X11) || defined(PROTO)
23 ! # if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 && !defined(sun)
24 # define USE_X11R6_XIM
30 #if defined(FEAT_GUI_X11) || defined(PROTO)
31 ! # if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 && !defined(SUN_SYSTEM)
32 # define USE_X11R6_XIM
35 *** ../vim-8.0.0122/src/pty.c 2016-08-29 22:42:20.000000000 +0200
36 --- src/pty.c 2016-12-03 16:30:02.416759344 +0100
43 # include <sys/conf.h>
51 # include <sys/conf.h>
56 # include <sys/ptem.h>
59 ! #if !defined(sun) && !defined(VMS) && !defined(MACOS)
60 # include <sys/ioctl.h>
63 ! #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
64 # include <sys/ttold.h>
68 # include <sys/ptem.h>
71 ! #if !defined(SUN_SYSTEM) && !defined(VMS) && !defined(MACOS)
72 # include <sys/ioctl.h>
75 ! #if defined(SUN_SYSTEM) && defined(LOCKPTY) && !defined(TIOCEXCL)
76 # include <sys/ttold.h>
82 if (ioctl(fd, I_PUSH, "ldterm") != 0)
85 if (ioctl(fd, I_PUSH, "ttcompat") != 0)
90 if (ioctl(fd, I_PUSH, "ldterm") != 0)
93 if (ioctl(fd, I_PUSH, "ttcompat") != 0)
101 ! #if defined(sun) && defined(TIOCGPGRP) && !defined(SUNOS3)
102 /* Hack to ensure that the slave side of the pty is
103 * unused. May not work in anything other than SunOS4.1
109 ! #if defined(SUN_SYSTEM) && defined(TIOCGPGRP) && !defined(SUNOS3)
110 /* Hack to ensure that the slave side of the pty is
111 * unused. May not work in anything other than SunOS4.1
113 *** ../vim-8.0.0122/src/os_unixx.h 2016-08-29 22:42:20.000000000 +0200
114 --- src/os_unixx.h 2016-12-03 16:39:47.200909192 +0100
117 # define signal sigset
120 ! /* sun's sys/ioctl.h redefines symbols from termio world */
121 ! #if defined(HAVE_SYS_IOCTL_H) && !defined(sun)
122 # include <sys/ioctl.h>
126 # define signal sigset
129 ! /* Sun's sys/ioctl.h redefines symbols from termio world */
130 ! #if defined(HAVE_SYS_IOCTL_H) && !defined(SUN_SYSTEM)
131 # include <sys/ioctl.h>
134 *** ../vim-8.0.0122/src/vim.h 2016-12-01 17:25:16.795864620 +0100
135 --- src/vim.h 2016-12-03 16:32:05.895946348 +0100
142 + /* Used to check for "sun", "__sun" is used by newer compilers. */
144 + # define SUN_SYSTEM
147 /* if we're compiling in C++ (currently only KVim), the system
148 * headers must have the correct prototypes or nothing will build.
149 * conversely, our prototypes might clash due to throw() specifiers and
152 #define FNE_INCL_BR 1 /* include [] in name */
153 #define FNE_CHECK_START 2 /* check name starts with valid character */
155 ! #if (defined(sun) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) \
157 # define OPEN_CHR_FILES
160 #define FNE_INCL_BR 1 /* include [] in name */
161 #define FNE_CHECK_START 2 /* check name starts with valid character */
163 ! #if (defined(SUN_SYSTEM) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) \
165 # define OPEN_CHR_FILES
167 *** ../vim-8.0.0122/src/version.c 2016-12-03 15:23:36.567060983 +0100
168 --- src/version.c 2016-12-03 16:40:28.632636420 +0100
172 { /* Add new patch number below this line */
178 hundred-and-one symptoms of being an internet addict:
179 89. In addition to your e-mail address being on your business
180 cards you even have your own domain.
182 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
183 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
184 \\\ an exciting new programming language -- http://www.Zimbu.org ///
185 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///