thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0123

Browse Source 
Problem:    Modern Sun compilers define "__sun" instead of "sun".
Solution:   Use __sun. (closes #1296)
This commit is contained in:
Bram Moolenaar
2016-12-03 16:40:51 +01:00
parent 3fad98e8af
commit a899e6ecc4
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbyte.c
View File

@@ -5735,7 +5735,7 @@ static char e_xim[] = N_("E285: Failed to create input context");
#endif #endif
#if defined(FEAT_GUI_X11) || defined(PROTO) #if defined(FEAT_GUI_X11) || defined(PROTO)
# if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 && !defined(sun) # if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 && !defined(SUN_SYSTEM)
# define USE_X11R6_XIM # define USE_X11R6_XIM
# endif # endif

4
src/os_unixx.h
View File

@@ -17,8 +17,8 @@
# define signal sigset # define signal sigset
#endif #endif
/* sun's sys/ioctl.h redefines symbols from termio world */ /* Sun's sys/ioctl.h redefines symbols from termio world */
#if defined(HAVE_SYS_IOCTL_H) && !defined(sun) #if defined(HAVE_SYS_IOCTL_H) && !defined(SUN_SYSTEM)
# include <sys/ioctl.h> # include <sys/ioctl.h>
#endif #endif

10
src/pty.c
View File

@@ -62,7 +62,7 @@
#ifdef sinix #ifdef sinix
#undef buf_T #undef buf_T
#endif #endif
# ifdef sun # ifdef SUN_SYSTEM
# include <sys/conf.h> # include <sys/conf.h>
# endif # endif
#endif #endif
@@ -87,11 +87,11 @@
# include <sys/ptem.h> # include <sys/ptem.h>
#endif #endif
#if !defined(sun) && !defined(VMS) && !defined(MACOS) #if !defined(SUN_SYSTEM) && !defined(VMS) && !defined(MACOS)
# include <sys/ioctl.h> # include <sys/ioctl.h>
#endif #endif
#if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) #if defined(SUN_SYSTEM) && defined(LOCKPTY) && !defined(TIOCEXCL)
# include <sys/ttold.h> # include <sys/ttold.h>
#endif #endif
@@ -166,7 +166,7 @@ SetupSlavePTY(int fd)
# endif # endif
if (ioctl(fd, I_PUSH, "ldterm") != 0) if (ioctl(fd, I_PUSH, "ldterm") != 0)
return -1; return -1;
# ifdef sun # ifdef SUN_SYSTEM
if (ioctl(fd, I_PUSH, "ttcompat") != 0) if (ioctl(fd, I_PUSH, "ttcompat") != 0)
return -1; return -1;
# endif # endif
@@ -391,7 +391,7 @@ OpenPTY(char **ttyn)
continue; continue;
} }
#endif #endif
#if defined(sun) && defined(TIOCGPGRP) && !defined(SUNOS3) #if defined(SUN_SYSTEM) && defined(TIOCGPGRP) && !defined(SUNOS3)
/* Hack to ensure that the slave side of the pty is /* Hack to ensure that the slave side of the pty is
* unused. May not work in anything other than SunOS4.1 * unused. May not work in anything other than SunOS4.1
*/ */

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
123,
/**/ /**/
122, 122,
/**/ /**/

7
src/vim.h
View File

@@ -268,6 +268,11 @@
# define UNUSED # define UNUSED
#endif #endif
/* Used to check for "sun", "__sun" is used by newer compilers. */
#if defined(__sun)
# define SUN_SYSTEM
#endif
/* if we're compiling in C++ (currently only KVim), the system /* if we're compiling in C++ (currently only KVim), the system
* headers must have the correct prototypes or nothing will build. * headers must have the correct prototypes or nothing will build.
* conversely, our prototypes might clash due to throw() specifiers and * conversely, our prototypes might clash due to throw() specifiers and
@@ -2487,7 +2492,7 @@ typedef enum
#define FNE_INCL_BR 1 /* include [] in name */ #define FNE_INCL_BR 1 /* include [] in name */
#define FNE_CHECK_START 2 /* check name starts with valid character */ #define FNE_CHECK_START 2 /* check name starts with valid character */
#if (defined(sun) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) \ #if (defined(SUN_SYSTEM) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) \
&& defined(S_ISCHR) && defined(S_ISCHR)
# define OPEN_CHR_FILES # define OPEN_CHR_FILES
#endif #endif