r461 - in trunk/vim: debian patches

[Pierre Habouzit]

Author: madcoder-guest
Date: 2006-01-15 12:59:34 +0000 (Sun, 15 Jan 2006)
New Revision: 461

Modified:
   trunk/vim/debian/changelog
   trunk/vim/patches/304_memline.c.diff
Log:
fix for #348170

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2006-01-15 09:49:42 UTC (rev 460)
+++ trunk/vim/debian/changelog	2006-01-15 12:59:34 UTC (rev 461)
@@ -20,8 +20,9 @@
 
   [ Pierre Habouzit ]
   * debian/control: fix vim-gui-common description. (closes: #347912)
+  * 304_memline.c.diff causes FTBFS on Hurd, fix it. (closes: #348170)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Sat, 14 Jan 2006 16:22:47 +0100
+ -- Pierre Habouzit <madcoder at debian.org>  Sun, 15 Jan 2006 13:57:23 +0100
 
 vim (1:6.4-006+1) unstable; urgency=low
 

Modified: trunk/vim/patches/304_memline.c.diff
===================================================================
--- trunk/vim/patches/304_memline.c.diff	2006-01-15 09:49:42 UTC (rev 460)
+++ trunk/vim/patches/304_memline.c.diff	2006-01-15 12:59:34 UTC (rev 461)
@@ -1,7 +1,18 @@
 diff -u vim64.new/src/memline.c vim64.new/src/memline.c
---- vim~/vim/src/memline.c	2005-11-18 09:18:01.000000000 -0500
-+++ vim/vim/src/memline.c	2005-11-25 17:41:04.000000000 -0500
-@@ -3251,6 +3251,69 @@
+--- vim64.new/src/memline.c     2005-11-18 09:18:01.000000000 -0500
++++ vim64.new/src/memline.c     2005-11-25 17:41:04.000000000 -0500
+@@ -58,6 +58,10 @@
+ # include <proto/dos.h>	    /* for Open() and Close() */
+ #endif
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ typedef struct block0		ZERO_BL;    /* contents of the first block */
+ typedef struct pointer_block	PTR_BL;	    /* contents of a pointer block */
+ typedef struct data_block	DATA_BL;    /* contents of a data block */
+@@ -3251,6 +3255,69 @@
      }
  }
  
@@ -71,7 +82,7 @@
  /*
   * make swap file name out of the file name and a directory name
   */
-@@ -3260,6 +3323,8 @@
+@@ -3260,6 +3327,8 @@
      char_u	*dir_name;
  {
      char_u	*r, *s;
@@ -80,7 +91,7 @@
  
  #if defined(UNIX) || defined(WIN3264)  /* Need _very_ long file names */
      s = dir_name + STRLEN(dir_name);
-@@ -3275,6 +3340,12 @@
+@@ -3275,6 +3344,12 @@
      }
  #endif
  
@@ -93,7 +104,7 @@
      r = buf_modname(
  #ifdef SHORT_FNAME
  	    TRUE,
-@@ -3285,7 +3356,7 @@
+@@ -3285,7 +3360,7 @@
  	    /* Avoid problems if fname has special chars, eg <Wimp$Scrap> */
  	    buf->b_ffname,
  #else