vim/patches/vim-7.3.087.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.087
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.087
  11 Problem:    EINTR is not always defined.
  12 Solution:   Include errno.h in vim.h.
  13 Files:      src/if_cscope.c, src/if_tcl.c, src/integration.c, src/memline.c,
  14             src/os_mswin.c, src/os_win16.c, src/os_win32.c, src/vim.h,
  15             src/workshop.c
  16
  17
  18 *** ../vim-7.3.086/src/if_cscope.c      2010-12-17 18:06:00.000000000 +0100
  19 --- src/if_cscope.c     2010-12-17 20:06:01.000000000 +0100
  20 ***************
  21 *** 13,20 ****
  22
  23   #if defined(FEAT_CSCOPE) || defined(PROTO)
  24
  25 - #include <string.h>
  26 - #include <errno.h>
  27   #include <assert.h>
  28   #include <sys/types.h>
  29   #include <sys/stat.h>
  30 --- 13,18 ----
  31 *** ../vim-7.3.086/src/if_tcl.c 2010-08-15 21:57:27.000000000 +0200
  32 --- src/if_tcl.c        2010-12-17 20:06:56.000000000 +0100
  33 ***************
  34 *** 74,80 ****
  35   #endif
  36
  37   #include <tcl.h>
  38 - #include <errno.h>
  39   #include <string.h>
  40
  41   typedef struct
  42 --- 74,79 ----
  43 *** ../vim-7.3.086/src/integration.c    2010-08-15 21:57:29.000000000 +0200
  44 --- src/integration.c   2010-12-17 20:07:12.000000000 +0100
  45 ***************
  46 *** 33,39 ****
  47   #include <sys/un.h>
  48   #endif
  49
  50 - #include <errno.h>
  51   #include <sys/types.h>
  52   #include <sys/socket.h>
  53   #include <sys/param.h>
  54 --- 33,38 ----
  55 *** ../vim-7.3.086/src/memline.c        2010-12-17 18:06:00.000000000 +0100
  56 --- src/memline.c       2010-12-17 20:07:31.000000000 +0100
  57 ***************
  58 *** 52,61 ****
  59   # include <proto/dos.h>           /* for Open() and Close() */
  60   #endif
  61
  62 - #ifdef HAVE_ERRNO_H
  63 - # include <errno.h>
  64 - #endif
  65 -
  66   typedef struct block0         ZERO_BL;    /* contents of the first block */
  67   typedef struct pointer_block  PTR_BL;     /* contents of a pointer block */
  68   typedef struct data_block     DATA_BL;    /* contents of a data block */
  69 --- 52,57 ----
  70 *** ../vim-7.3.086/src/os_mswin.c       2010-12-17 18:06:00.000000000 +0100
  71 --- src/os_mswin.c      2010-12-17 20:08:14.000000000 +0100
  72 ***************
  73 *** 30,36 ****
  74   # include <string.h>
  75   #endif
  76   #include <sys/types.h>
  77 - #include <errno.h>
  78   #include <signal.h>
  79   #include <limits.h>
  80   #include <process.h>
  81 --- 30,35 ----
  82 *** ../vim-7.3.086/src/os_win16.c       2010-12-17 18:06:00.000000000 +0100
  83 --- src/os_win16.c      2010-12-17 20:08:53.000000000 +0100
  84 ***************
  85 *** 25,31 ****
  86   #include <dos.h>
  87   #include <string.h>
  88   #include <sys/types.h>
  89 - #include <errno.h>
  90   #include <signal.h>
  91   #include <limits.h>
  92   #include <process.h>
  93 --- 25,30 ----
  94 *** ../vim-7.3.086/src/os_win32.c       2010-12-17 18:06:00.000000000 +0100
  95 --- src/os_win32.c      2010-12-17 20:09:18.000000000 +0100
  96 ***************
  97 *** 27,33 ****
  98   #endif
  99
 100   #include <sys/types.h>
 101 - #include <errno.h>
 102   #include <signal.h>
 103   #include <limits.h>
 104   #include <process.h>
 105 --- 27,32 ----
 106 *** ../vim-7.3.086/src/vim.h    2010-12-17 18:06:00.000000000 +0100
 107 --- src/vim.h   2010-12-17 20:09:56.000000000 +0100
 108 ***************
 109 *** 480,485 ****
 110 --- 480,490 ----
 111   # include <sys/stat.h>
 112   #endif
 113
 114 + #if defined(HAVE_ERRNO_H) || defined(DJGPP) || defined(WIN16) \
 115 +       || defined(WIN32) || defined(_WIN64) || defined(__EMX__)
 116 + # include <errno.h>
 117 + #endif
 118 +
 119   /*
 120    * Allow other (non-unix) systems to configure themselves now
 121    * These are also in os_unix.h, because osdef.sh needs them there.
 122 *** ../vim-7.3.086/src/workshop.c       2010-08-15 21:57:26.000000000 +0200
 123 --- src/workshop.c      2010-12-17 20:09:31.000000000 +0100
 124 ***************
 125 *** 16,22 ****
 126   #include <sys/types.h>
 127   #include <netdb.h>
 128   #include <netinet/in.h>
 129 - #include <errno.h>
 130   #include <sys/socket.h>
 131   #ifdef HAVE_LIBGEN_H
 132   # include <libgen.h>
 133 --- 16,21 ----
 134 *** ../vim-7.3.086/src/version.c        2010-12-17 18:52:56.000000000 +0100
 135 --- src/version.c       2010-12-17 20:14:49.000000000 +0100
 136 ***************
 137 *** 716,717 ****
 138 --- 716,719 ----
 139   {   /* Add new patch number below this line */
 140 + /**/
 141 +     87,
 142   /**/
 143
 144 --
 145 How To Keep A Healthy Level Of Insanity:
 146 17. When the money comes out the ATM, scream "I won!, I won! 3rd
 147     time this week!!!!!"
 148
 149  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 150 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 151 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 152  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///