Revision: 7435
Author:   ek.kato
Date:     Wed Feb  1 01:31:56 2012
Log:      * Merge r7433, r7434 from trunk.

http://code.google.com/p/uim/source/detail?r=7435

Modified:
 /branches/1.7/fep/uim-fep.c
 /branches/1.7/replace/os_dep.h

=======================================
--- /branches/1.7/fep/uim-fep.c Wed Jan 11 00:24:17 2012
+++ /branches/1.7/fep/uim-fep.c Wed Feb  1 01:31:56 2012
@@ -144,9 +144,7 @@
 static int s_master;
 /* µ¯Æ°»þ¤ÎüËö¾õÂÖ */
 static struct termios s_save_tios;
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
+
 static char s_path_setmode[MAXPATHLEN];
 static char s_path_getmode[MAXPATHLEN];
 static int s_setmode_fd = -1;
=======================================
--- /branches/1.7/replace/os_dep.h      Tue Jan 31 18:10:59 2012
+++ /branches/1.7/replace/os_dep.h      Wed Feb  1 01:31:56 2012
@@ -57,14 +57,12 @@
 # ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX
 # else /* PATH_MAX */
-#  define MAXPATHLEN 256       /* 64 in openssh-portable */
+#  define MAXPATHLEN 1024      /* 64 in openssh-portable */
 # endif /* PATH_MAX */
 #endif /* MAXPATHLEN */

 #ifndef PATH_MAX
-# ifdef _POSIX_PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-# endif
+# define PATH_MAX 1024         /* _POSIX_PATH_MAX in openssh-portable */
 #endif

 #ifdef __cplusplus

Reply via email to