summaryrefslogtreecommitdiff
path: root/devel/ups-debug/files/patch-04
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1998-09-16 20:48:34 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1998-09-16 20:48:34 +0000
commit1e1a8abab1815aac44069e353a81f5f614e57f7c (patch)
tree779a6eac3e2203671f88388ba28fb81a5cb7944e /devel/ups-debug/files/patch-04
parentFix building problems on a.out systems (diff)
Dist patch fixes problems on 2.2.x.
Diffstat (limited to '')
-rw-r--r--devel/ups-debug/files/patch-0424
1 files changed, 9 insertions, 15 deletions
diff --git a/devel/ups-debug/files/patch-04 b/devel/ups-debug/files/patch-04
index 9825aaf8564d..d983cb44cb42 100644
--- a/devel/ups-debug/files/patch-04
+++ b/devel/ups-debug/files/patch-04
@@ -1,23 +1,19 @@
---- ups/xc_builtins.c.orig Fri Jun 19 11:10:51 1998
-+++ ups/xc_builtins.c Tue Jun 23 18:32:04 1998
-@@ -121,8 +121,8 @@
- static int builtin_write PROTO((int fd, const void *buf, size_t nbytes));
+--- ups/xc_builtins.c.orig Wed Sep 16 05:26:07 1998
++++ ups/xc_builtins.c Wed Sep 16 12:41:52 1998
+@@ -122,7 +122,7 @@
extern int pipe PROTO((int *fds));
static int builtin_pipe PROTO((int *fds));
--extern int lseek PROTO((int fd, off_t offset, int whence));
+ extern off_t lseek PROTO((int fd, off_t offset, int whence));
-static int builtin_lseek PROTO((int fd, off_t offset, int whence));
-+extern off_t lseek PROTO((int fd, off_t offset, int whence));
+static off_t builtin_lseek PROTO((int fd, off_t offset, int whence));
/*extern int fcntl PROTO((int fd, int cmd, char *arg));*/
static int builtin_fcntl PROTO((int fd, int cmd, char *arg));
extern int dup2 PROTO((int fd, int newfd));
-@@ -139,8 +139,8 @@
- extern int flock PROTO((int fd, int op));
+@@ -140,7 +140,7 @@
static int builtin_flock PROTO((int fd, int op));
#endif
--extern int ftruncate PROTO((int fd, long length));
+ extern int ftruncate PROTO((int fd, off_t length));
-static int builtin_ftruncate PROTO((int fd, long length));
-+extern int ftruncate PROTO((int fd, off_t length));
+static int builtin_ftruncate PROTO((int fd, off_t length));
extern int ioctl PROTO((int fd, unsigned cmd, caddr_t arg));
static int builtin_ioctl PROTO((int fd, unsigned cmd, caddr_t arg));
@@ -31,12 +27,10 @@
#ifdef OS_LINUX
extern const char *const sys_errlist[];
extern int sys_nerr;
-@@ -319,7 +319,8 @@
- int utimes(), atoi(), rand(), system(), abs();
+@@ -320,6 +320,7 @@
int getuid(), geteuid(), getgid(), getegid(), setreuid(), setregid();
int setgroups(), getgroups();
--int rename(), read(), write(), pipe(), lseek(), fcntl(), close(), dup(), dup2();
-+int rename(), read(), write(), pipe(), fcntl(), close(), dup(), dup2();
+ int rename(), read(), write(), pipe(), fcntl(), close(), dup(), dup2();
+off_t lseek();
int getdtablesize(), fchown(), flock(), fsync(), ftruncate();
int ioctl(), select(), open(), creat(), link(), unlink(), chown(), chmod();
@@ -48,7 +42,7 @@
-long length;
+off_t length;
{
- return fd_ok(fd) ? ftruncate(fd, length) : -1;
+ return fd_ok(fd) ? ftruncate(fd, (off_t)length) : -1;
}
@@ -531,7 +532,7 @@
return res;