summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-06-20 16:07:02 +0000
committerBram Moolenaar <Bram@vim.org>2008-06-20 16:07:02 +0000
commit38f12a9e2b5c9fc4536028d7ac0906abc5f1e1a9 (patch)
tree51f7a558da04b6b0682570283495defa6675f07b
parentba79b4e389947a38ad80302a2923bc9b8a55e777 (diff)
updated for version 7.1-324v7.1.324
-rw-r--r--src/os_unix.h8
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/os_unix.h b/src/os_unix.h
index be6048fa5d..a337183c4a 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -432,7 +432,13 @@ typedef struct dsc$descriptor DESC;
* Unix has plenty of memory, use large buffers
*/
#define CMDBUFFSIZE 1024 /* size of the command processing buffer */
-#define MAXPATHL 1024 /* Unix has long paths and plenty of memory */
+
+/* Use the system path length if it makes sense. */
+#if defined(PATH_MAX) && (PATH_MAX > 1000)
+# define MAXPATHL PATH_MAX
+#else
+# define MAXPATHL 1024
+#endif
#define CHECK_INODE /* used when checking if a swap file already
exists for a file */
diff --git a/src/version.c b/src/version.c
index ab34115a14..8406e897d8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 324,
+/**/
323,
/**/
322,