home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.4 / 7.4.299 < prev    next >
Encoding:
Internet Message Format  |  2014-05-21  |  18.8 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.4.299
  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.4.299
  11. Problem:    When running configure twice DYNAMIC_PYTHON_DLL may become empty.
  12. Solution:   Use AC_CACHE_VAL. (Ken Takata)
  13. Files:        src/configure.in, src/auto/configure
  14.  
  15.  
  16. *** ../vim-7.4.298/src/configure.in    2014-04-12 13:11:58.260430356 +0200
  17. --- src/configure.in    2014-05-22 14:39:39.326486611 +0200
  18. ***************
  19. *** 1132,1141 ****
  20.             vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  21.           fi
  22.       ])
  23.   
  24. -     if test "X$python_DLLLIBRARY" != "X"; then
  25. -       python_INSTSONAME="$python_DLLLIBRARY"
  26. -     fi
  27.       PYTHON_LIBS="${vi_cv_path_python_plibs}"
  28.       if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
  29.         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
  30. --- 1132,1146 ----
  31.             vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  32.           fi
  33.       ])
  34. +     AC_CACHE_VAL(vi_cv_dll_name_python,
  35. +     [
  36. +       if test "X$python_DLLLIBRARY" != "X"; then
  37. +         vi_cv_dll_name_python="$python_DLLLIBRARY"
  38. +       else
  39. +         vi_cv_dll_name_python="$python_INSTSONAME"
  40. +       fi
  41. +     ])
  42.   
  43.       PYTHON_LIBS="${vi_cv_path_python_plibs}"
  44.       if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
  45.         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
  46. ***************
  47. *** 1323,1341 ****
  48.       @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
  49.       @echo "python3_INSTSONAME='$(INSTSONAME)'"
  50.   eof
  51. !             dnl -- delete the lines from make about Entering/Leaving directory
  52. !             eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
  53. !             rm -f -- "${tmp_mkf}"
  54.           vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
  55. !             vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
  56. !             dnl remove -ltermcap, it can conflict with an earlier -lncurses
  57. !             vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
  58. !             vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
  59. !         ])
  60. !   
  61. !         if test "X$python3_DLLLIBRARY" != "X"; then
  62. !       python3_INSTSONAME="$python3_DLLLIBRARY"
  63. !         fi
  64.           PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
  65.           if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
  66.             PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
  67. --- 1328,1351 ----
  68.       @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
  69.       @echo "python3_INSTSONAME='$(INSTSONAME)'"
  70.   eof
  71. !         dnl -- delete the lines from make about Entering/Leaving directory
  72. !         eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
  73. !         rm -f -- "${tmp_mkf}"
  74.           vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
  75. !         vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
  76. !         dnl remove -ltermcap, it can conflict with an earlier -lncurses
  77. !         vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
  78. !         vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
  79. !     ])
  80. !     AC_CACHE_VAL(vi_cv_dll_name_python3,
  81. !     [
  82. !       if test "X$python3_DLLLIBRARY" != "X"; then
  83. !         vi_cv_dll_name_python3="$python3_DLLLIBRARY"
  84. !       else
  85. !         vi_cv_dll_name_python3="$python3_INSTSONAME"
  86. !       fi
  87. !     ])
  88. ! 
  89.           PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
  90.           if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
  91.             PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
  92. ***************
  93. *** 1458,1464 ****
  94.       int main(int argc, char** argv)
  95.       {
  96.         int not_needed = 0;
  97. !       if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
  98.               not_needed = 1;
  99.         return !not_needed;
  100.       }])],
  101. --- 1468,1474 ----
  102.       int main(int argc, char** argv)
  103.       {
  104.         int not_needed = 0;
  105. !       if (no_rtl_global_needed_for("${vi_cv_dll_name_python}", "${vi_cv_path_python_pfx}"))
  106.               not_needed = 1;
  107.         return !not_needed;
  108.       }])],
  109. ***************
  110. *** 1504,1510 ****
  111.       int main(int argc, char** argv)
  112.       {
  113.         int not_needed = 0;
  114. !       if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
  115.               not_needed = 1;
  116.         return !not_needed;
  117.       }])],
  118. --- 1514,1520 ----
  119.       int main(int argc, char** argv)
  120.       {
  121.         int not_needed = 0;
  122. !       if (no_rtl_global_needed_for("${vi_cv_dll_name_python3}", L"${vi_cv_path_python3_pfx}"))
  123.               not_needed = 1;
  124.         return !not_needed;
  125.       }])],
  126. ***************
  127. *** 1515,1531 ****
  128.   
  129.     PYTHON_SRC="if_python.c"
  130.     PYTHON_OBJ="objects/if_python.o"
  131. !   PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
  132.     PYTHON_LIBS=
  133.     PYTHON3_SRC="if_python3.c"
  134.     PYTHON3_OBJ="objects/if_python3.o"
  135. !   PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
  136.     PYTHON3_LIBS=
  137.   elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then
  138.     AC_DEFINE(DYNAMIC_PYTHON)
  139.     PYTHON_SRC="if_python.c"
  140.     PYTHON_OBJ="objects/if_python.o"
  141. !   PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
  142.     PYTHON_LIBS=
  143.   elif test "$python_ok" = yes; then
  144.     dnl Check that adding -fPIE works.  It may be needed when using a static
  145. --- 1525,1541 ----
  146.   
  147.     PYTHON_SRC="if_python.c"
  148.     PYTHON_OBJ="objects/if_python.o"
  149. !   PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
  150.     PYTHON_LIBS=
  151.     PYTHON3_SRC="if_python3.c"
  152.     PYTHON3_OBJ="objects/if_python3.o"
  153. !   PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${vi_cv_dll_name_python3}\\\""
  154.     PYTHON3_LIBS=
  155.   elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then
  156.     AC_DEFINE(DYNAMIC_PYTHON)
  157.     PYTHON_SRC="if_python.c"
  158.     PYTHON_OBJ="objects/if_python.o"
  159. !   PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
  160.     PYTHON_LIBS=
  161.   elif test "$python_ok" = yes; then
  162.     dnl Check that adding -fPIE works.  It may be needed when using a static
  163. ***************
  164. *** 1547,1553 ****
  165.     AC_DEFINE(DYNAMIC_PYTHON3)
  166.     PYTHON3_SRC="if_python3.c"
  167.     PYTHON3_OBJ="objects/if_python3.o"
  168. !   PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
  169.     PYTHON3_LIBS=
  170.   elif test "$python3_ok" = yes; then
  171.     dnl Check that adding -fPIE works.  It may be needed when using a static
  172. --- 1557,1563 ----
  173.     AC_DEFINE(DYNAMIC_PYTHON3)
  174.     PYTHON3_SRC="if_python3.c"
  175.     PYTHON3_OBJ="objects/if_python3.o"
  176. !   PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${vi_cv_dll_name_python3}\\\""
  177.     PYTHON3_LIBS=
  178.   elif test "$python3_ok" = yes; then
  179.     dnl Check that adding -fPIE works.  It may be needed when using a static
  180. *** ../vim-7.4.298/src/auto/configure    2014-04-12 13:11:58.268430356 +0200
  181. --- src/auto/configure    2014-05-22 14:40:05.146486086 +0200
  182. ***************
  183. *** 5893,5902 ****
  184.   
  185.   fi
  186.   
  187.   
  188. -     if test "X$python_DLLLIBRARY" != "X"; then
  189. -       python_INSTSONAME="$python_DLLLIBRARY"
  190. -     fi
  191.       PYTHON_LIBS="${vi_cv_path_python_plibs}"
  192.       if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
  193.         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
  194. --- 5893,5911 ----
  195.   
  196.   fi
  197.   
  198. +     if ${vi_cv_dll_name_python+:} false; then :
  199. +   $as_echo_n "(cached) " >&6
  200. + else
  201. + 
  202. +       if test "X$python_DLLLIBRARY" != "X"; then
  203. +         vi_cv_dll_name_python="$python_DLLLIBRARY"
  204. +       else
  205. +         vi_cv_dll_name_python="$python_INSTSONAME"
  206. +       fi
  207. + 
  208. + fi
  209. + 
  210.   
  211.       PYTHON_LIBS="${vi_cv_path_python_plibs}"
  212.       if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
  213.         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
  214. ***************
  215. *** 6200,6218 ****
  216.       @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
  217.       @echo "python3_INSTSONAME='$(INSTSONAME)'"
  218.   eof
  219. !                         eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
  220. !             rm -f -- "${tmp_mkf}"
  221.           vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
  222. !             vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
  223. !                         vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
  224. !             vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
  225.   
  226.   fi
  227.   
  228.   
  229. -         if test "X$python3_DLLLIBRARY" != "X"; then
  230. -       python3_INSTSONAME="$python3_DLLLIBRARY"
  231. -         fi
  232.           PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
  233.           if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
  234.             PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
  235. --- 6209,6236 ----
  236.       @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
  237.       @echo "python3_INSTSONAME='$(INSTSONAME)'"
  238.   eof
  239. !                 eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
  240. !         rm -f -- "${tmp_mkf}"
  241.           vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
  242. !         vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
  243. !                 vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
  244. !         vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
  245. ! 
  246. ! fi
  247. ! 
  248. !     if ${vi_cv_dll_name_python3+:} false; then :
  249. !   $as_echo_n "(cached) " >&6
  250. ! else
  251. ! 
  252. !       if test "X$python3_DLLLIBRARY" != "X"; then
  253. !         vi_cv_dll_name_python3="$python3_DLLLIBRARY"
  254. !       else
  255. !         vi_cv_dll_name_python3="$python3_INSTSONAME"
  256. !       fi
  257.   
  258.   fi
  259.   
  260.   
  261.           PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
  262.           if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
  263.             PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
  264. ***************
  265. *** 6372,6378 ****
  266.       int main(int argc, char** argv)
  267.       {
  268.         int not_needed = 0;
  269. !       if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
  270.               not_needed = 1;
  271.         return !not_needed;
  272.       }
  273. --- 6390,6396 ----
  274.       int main(int argc, char** argv)
  275.       {
  276.         int not_needed = 0;
  277. !       if (no_rtl_global_needed_for("${vi_cv_dll_name_python}", "${vi_cv_path_python_pfx}"))
  278.               not_needed = 1;
  279.         return !not_needed;
  280.       }
  281. ***************
  282. *** 6438,6444 ****
  283.       int main(int argc, char** argv)
  284.       {
  285.         int not_needed = 0;
  286. !       if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
  287.               not_needed = 1;
  288.         return !not_needed;
  289.       }
  290. --- 6456,6462 ----
  291.       int main(int argc, char** argv)
  292.       {
  293.         int not_needed = 0;
  294. !       if (no_rtl_global_needed_for("${vi_cv_dll_name_python3}", L"${vi_cv_path_python3_pfx}"))
  295.               not_needed = 1;
  296.         return !not_needed;
  297.       }
  298. ***************
  299. *** 6461,6478 ****
  300.   
  301.     PYTHON_SRC="if_python.c"
  302.     PYTHON_OBJ="objects/if_python.o"
  303. !   PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
  304.     PYTHON_LIBS=
  305.     PYTHON3_SRC="if_python3.c"
  306.     PYTHON3_OBJ="objects/if_python3.o"
  307. !   PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
  308.     PYTHON3_LIBS=
  309.   elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then
  310.     $as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h
  311.   
  312.     PYTHON_SRC="if_python.c"
  313.     PYTHON_OBJ="objects/if_python.o"
  314. !   PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
  315.     PYTHON_LIBS=
  316.   elif test "$python_ok" = yes; then
  317.         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python" >&5
  318. --- 6479,6496 ----
  319.   
  320.     PYTHON_SRC="if_python.c"
  321.     PYTHON_OBJ="objects/if_python.o"
  322. !   PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
  323.     PYTHON_LIBS=
  324.     PYTHON3_SRC="if_python3.c"
  325.     PYTHON3_OBJ="objects/if_python3.o"
  326. !   PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${vi_cv_dll_name_python3}\\\""
  327.     PYTHON3_LIBS=
  328.   elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then
  329.     $as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h
  330.   
  331.     PYTHON_SRC="if_python.c"
  332.     PYTHON_OBJ="objects/if_python.o"
  333. !   PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
  334.     PYTHON_LIBS=
  335.   elif test "$python_ok" = yes; then
  336.         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python" >&5
  337. ***************
  338. *** 6511,6517 ****
  339.   
  340.     PYTHON3_SRC="if_python3.c"
  341.     PYTHON3_OBJ="objects/if_python3.o"
  342. !   PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
  343.     PYTHON3_LIBS=
  344.   elif test "$python3_ok" = yes; then
  345.         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python3" >&5
  346. --- 6529,6535 ----
  347.   
  348.     PYTHON3_SRC="if_python3.c"
  349.     PYTHON3_OBJ="objects/if_python3.o"
  350. !   PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${vi_cv_dll_name_python3}\\\""
  351.     PYTHON3_LIBS=
  352.   elif test "$python3_ok" = yes; then
  353.         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python3" >&5
  354. ***************
  355. *** 11420,11426 ****
  356.       We can't simply define LARGE_OFF_T to be 9223372036854775807,
  357.       since some C++ compilers masquerading as C compilers
  358.       incorrectly reject 9223372036854775807.  */
  359. ! #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
  360.     int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  361.                  && LARGE_OFF_T % 2147483647 == 1)
  362.                 ? 1 : -1];
  363. --- 11438,11444 ----
  364.       We can't simply define LARGE_OFF_T to be 9223372036854775807,
  365.       since some C++ compilers masquerading as C compilers
  366.       incorrectly reject 9223372036854775807.  */
  367. ! #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
  368.     int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  369.                  && LARGE_OFF_T % 2147483647 == 1)
  370.                 ? 1 : -1];
  371. ***************
  372. *** 11466,11472 ****
  373.       We can't simply define LARGE_OFF_T to be 9223372036854775807,
  374.       since some C++ compilers masquerading as C compilers
  375.       incorrectly reject 9223372036854775807.  */
  376. ! #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
  377.     int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  378.                  && LARGE_OFF_T % 2147483647 == 1)
  379.                 ? 1 : -1];
  380. --- 11484,11490 ----
  381.       We can't simply define LARGE_OFF_T to be 9223372036854775807,
  382.       since some C++ compilers masquerading as C compilers
  383.       incorrectly reject 9223372036854775807.  */
  384. ! #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
  385.     int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  386.                  && LARGE_OFF_T % 2147483647 == 1)
  387.                 ? 1 : -1];
  388. ***************
  389. *** 11490,11496 ****
  390.       We can't simply define LARGE_OFF_T to be 9223372036854775807,
  391.       since some C++ compilers masquerading as C compilers
  392.       incorrectly reject 9223372036854775807.  */
  393. ! #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
  394.     int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  395.                  && LARGE_OFF_T % 2147483647 == 1)
  396.                 ? 1 : -1];
  397. --- 11508,11514 ----
  398.       We can't simply define LARGE_OFF_T to be 9223372036854775807,
  399.       since some C++ compilers masquerading as C compilers
  400.       incorrectly reject 9223372036854775807.  */
  401. ! #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
  402.     int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  403.                  && LARGE_OFF_T % 2147483647 == 1)
  404.                 ? 1 : -1];
  405. ***************
  406. *** 11535,11541 ****
  407.       We can't simply define LARGE_OFF_T to be 9223372036854775807,
  408.       since some C++ compilers masquerading as C compilers
  409.       incorrectly reject 9223372036854775807.  */
  410. ! #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
  411.     int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  412.                  && LARGE_OFF_T % 2147483647 == 1)
  413.                 ? 1 : -1];
  414. --- 11553,11559 ----
  415.       We can't simply define LARGE_OFF_T to be 9223372036854775807,
  416.       since some C++ compilers masquerading as C compilers
  417.       incorrectly reject 9223372036854775807.  */
  418. ! #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
  419.     int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  420.                  && LARGE_OFF_T % 2147483647 == 1)
  421.                 ? 1 : -1];
  422. ***************
  423. *** 11559,11565 ****
  424.       We can't simply define LARGE_OFF_T to be 9223372036854775807,
  425.       since some C++ compilers masquerading as C compilers
  426.       incorrectly reject 9223372036854775807.  */
  427. ! #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
  428.     int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  429.                  && LARGE_OFF_T % 2147483647 == 1)
  430.                 ? 1 : -1];
  431. --- 11577,11583 ----
  432.       We can't simply define LARGE_OFF_T to be 9223372036854775807,
  433.       since some C++ compilers masquerading as C compilers
  434.       incorrectly reject 9223372036854775807.  */
  435. ! #define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
  436.     int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
  437.                  && LARGE_OFF_T % 2147483647 == 1)
  438.                 ? 1 : -1];
  439. *** ../vim-7.4.298/src/version.c    2014-05-22 14:19:51.674510749 +0200
  440. --- src/version.c    2014-05-22 14:36:44.634490162 +0200
  441. ***************
  442. *** 736,737 ****
  443. --- 736,739 ----
  444.   {   /* Add new patch number below this line */
  445. + /**/
  446. +     299,
  447.   /**/
  448.  
  449. -- 
  450. hundred-and-one symptoms of being an internet addict:
  451. 190. You quickly hand over your wallet, leather jacket, and car keys
  452.      during a mugging, then proceed to beat the crap out of your
  453.      assailant when he asks for your laptop.
  454.  
  455.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  456. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  457. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  458.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  459.