summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2001-07-02 11:33:26 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2001-07-02 11:33:26 +0000
commit0f960cc8cac71ff4fdc88a45603b105e469b6079 (patch)
treece32a9cb04df62a144c93cd37ea77e5b0d5d78d4
parent05fdd6fed2c736d28c63b595db5c2be4fabfd7a0 (diff)
downloadzsh-0f960cc8cac71ff4fdc88a45603b105e469b6079.tar.gz
zsh-0f960cc8cac71ff4fdc88a45603b105e469b6079.zip
fix IRIX 5.3 specific compilation problems and some error messages (15204)
-rw-r--r--ChangeLog5
-rw-r--r--Src/compat.c2
-rw-r--r--Src/params.c6
-rw-r--r--zshconfig.ac2
4 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d242eb30d..ac299f589 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-02 Oliver Kiddle <opk@zsh.org>
+
+ * 15204: zshconfig.ac, Src/compat.c, Src/params.c: fix compilation
+ problems on IRIX 5.2 and correct error messages
+
2001-07-02 Bart Schaefer <schaefer@zsh.org>
* 15198: Completion/Zsh/Context/_tilde: Return nonzero if no
diff --git a/Src/compat.c b/Src/compat.c
index 8cfb8a3a5..86611a727 100644
--- a/Src/compat.c
+++ b/Src/compat.c
@@ -184,7 +184,7 @@ zpathmax(char *dir)
((errno = 0), PATH_MAX - dirlen)));
#endif
}
-#endif // 0
+#endif /* 0 */
#ifdef HAVE_SYSCONF
/* This is replaced by a macro from system.h if not HAVE_SYSCONF. *
diff --git a/Src/params.c b/Src/params.c
index f96824165..cd0b16964 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -1390,15 +1390,15 @@ fetchvalue(Value v, char **pptr, int bracks, int flags)
return NULL;
}
if (v->start < -MAX_ARRLEN) {
- zerr("%s: subscript too %s: %d", "small", v->start);
+ zerr("subscript too %s: %d", "small", v->start);
return NULL;
}
if (v->end > MAX_ARRLEN+1) {
- zerr("%s: subscript too %s: %d", "big", v->end - !!isset(KSHARRAYS));
+ zerr("subscript too %s: %d", "big", v->end - !!isset(KSHARRAYS));
return NULL;
}
if (v->end < -MAX_ARRLEN) {
- zerr("%s: subscript too %s: %d", "small", v->end);
+ zerr("subscript too %s: %d", "small", v->end);
return NULL;
}
return v;
diff --git a/zshconfig.ac b/zshconfig.ac
index c268366ae..78fb6404e 100644
--- a/zshconfig.ac
+++ b/zshconfig.ac
@@ -1305,7 +1305,7 @@ main()
if(pid < 0)
exit(1);
if(pid) {
- fd = open("/tmp/fifo$$", O_RDWR);
+ fd = open("/tmp/fifo$$", O_RDONLY);
exit(fd < 0 || read(fd, &c, 1) != 1 || c != 'x');
}
fd = open("/tmp/fifo$$", O_WRONLY);