mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
Fix building this port under recent versions of -stable. My
previous fix for dealing with the semctl() interface change was incomplete.
This commit is contained in:
parent
dbfa2863a1
commit
05bb3c0285
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13681
@ -7,7 +7,7 @@ Fix the wrapper for ftruncate so that it deals properly with the 64-bit
|
||||
arguments.
|
||||
|
||||
--- m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c.orig Sat Mar 23 14:52:21 1996
|
||||
+++ m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c Sat Sep 19 10:35:49 1998
|
||||
+++ m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c Mon Oct 5 19:56:27 1998
|
||||
@@ -80,7 +80,8 @@
|
||||
#include <sys/file.h>
|
||||
#include <sys/param.h>
|
||||
@ -437,7 +437,7 @@ arguments.
|
||||
{ int result;
|
||||
|
||||
ENTER_CRITICAL;
|
||||
@@ -950,44 +920,41 @@
|
||||
@@ -950,44 +920,42 @@
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -467,7 +467,8 @@ arguments.
|
||||
+#endif
|
||||
+{
|
||||
+ int result;
|
||||
+#if __FreeBSD_version >= 300002
|
||||
+#if (227002 <= __FreeBSD_version && __FreeBSD_version < 300000) || \
|
||||
+ __FreeBSD_version >= 300002
|
||||
+ union semun arg;
|
||||
+ va_list ap;
|
||||
|
||||
@ -508,7 +509,7 @@ arguments.
|
||||
break;
|
||||
}
|
||||
result = syscall(SYS_semsys, 0, semid, semnum, cmd, arg);
|
||||
@@ -1012,24 +979,6 @@
|
||||
@@ -1012,24 +980,6 @@
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -533,7 +534,7 @@ arguments.
|
||||
int sendmsg(s, msg, flags) /* ok */
|
||||
int s;
|
||||
const struct msghdr msg[];
|
||||
@@ -1051,29 +1000,8 @@
|
||||
@@ -1051,29 +1001,8 @@
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -564,7 +565,7 @@ arguments.
|
||||
int namelen;
|
||||
{ int result;
|
||||
|
||||
@@ -1086,7 +1014,7 @@
|
||||
@@ -1086,7 +1015,7 @@
|
||||
|
||||
int setgroups(ngroups, gidset) /* ok */
|
||||
int ngroups;
|
||||
@ -573,7 +574,7 @@ arguments.
|
||||
{ int result;
|
||||
|
||||
ENTER_CRITICAL;
|
||||
@@ -1097,7 +1025,7 @@
|
||||
@@ -1097,7 +1026,7 @@
|
||||
}
|
||||
|
||||
int sethostname(name, namelen) /* ok */
|
||||
@ -582,7 +583,7 @@ arguments.
|
||||
int namelen;
|
||||
{ int result;
|
||||
#if __FreeBSD__ >= 2
|
||||
@@ -1213,20 +1141,20 @@
|
||||
@@ -1213,20 +1142,20 @@
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -610,7 +611,7 @@ arguments.
|
||||
int sigaltstack(ss, oss) /* ok */
|
||||
const struct sigaltstack *ss;
|
||||
struct sigaltstack *oss;
|
||||
@@ -1239,20 +1167,6 @@
|
||||
@@ -1239,20 +1168,6 @@
|
||||
EXIT_CRITICAL;
|
||||
return result;
|
||||
}
|
||||
@ -631,7 +632,7 @@ arguments.
|
||||
|
||||
int socketpair(d, type, protocol, sv) /* ok */
|
||||
int d, type, protocol;
|
||||
@@ -1267,7 +1181,7 @@
|
||||
@@ -1267,7 +1182,7 @@
|
||||
}
|
||||
|
||||
int stat(path, buf) /* ok */
|
||||
@ -640,7 +641,7 @@ arguments.
|
||||
struct stat *buf;
|
||||
{ int result;
|
||||
|
||||
@@ -1280,7 +1194,7 @@
|
||||
@@ -1280,7 +1195,7 @@
|
||||
}
|
||||
|
||||
int swapon(special) /* ok */
|
||||
@ -649,7 +650,7 @@ arguments.
|
||||
{ int result;
|
||||
|
||||
ENTER_CRITICAL;
|
||||
@@ -1291,8 +1205,8 @@
|
||||
@@ -1291,8 +1206,8 @@
|
||||
}
|
||||
|
||||
int symlink(name1, name2) /* ok */
|
||||
@ -660,7 +661,7 @@ arguments.
|
||||
{ int result;
|
||||
|
||||
ENTER_CRITICAL;
|
||||
@@ -1304,14 +1218,14 @@
|
||||
@@ -1304,14 +1219,14 @@
|
||||
}
|
||||
|
||||
int truncate(path, length) /* ok */
|
||||
@ -679,7 +680,7 @@ arguments.
|
||||
EXIT_CRITICAL;
|
||||
return result;
|
||||
}
|
||||
@@ -1328,7 +1242,7 @@
|
||||
@@ -1328,7 +1243,7 @@
|
||||
}
|
||||
|
||||
int unlink(path) /* ok */
|
||||
@ -688,7 +689,7 @@ arguments.
|
||||
{ int result;
|
||||
|
||||
ENTER_CRITICAL;
|
||||
@@ -1414,19 +1328,6 @@
|
||||
@@ -1414,19 +1329,6 @@
|
||||
ENTER_CRITICAL;
|
||||
MAKE_WRITABLE(status);
|
||||
result = syscall(SYS_wait4, pid, status, options, NULL);
|
||||
|
Loading…
Reference in New Issue
Block a user