mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-15 08:10:07 +02:00
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
--- cvs-1.12.13/lib/stdbool_.h 2005-05-23 17:44:32.000000000 +0000
|
|
+++ cvs-1.12.13.patched/lib/stdbool_.h 2008-04-16 19:48:25.000000000 +0000
|
|
@@ -55,7 +55,7 @@
|
|
|
|
/* BeOS <sys/socket.h> already #defines false 0, true 1. We use the same
|
|
definitions below, but temporarily we have to #undef them. */
|
|
-#ifdef __BEOS__
|
|
+#if defined(__BEOS__) && !defined(__HAIKU__)
|
|
# include <OS.h> /* defines bool but not _Bool */
|
|
# undef false
|
|
# undef true
|
|
@@ -70,7 +70,7 @@
|
|
(see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
|
|
(see ISO C 99 6.3.1.1.(2)). So we add a negative value to the
|
|
enum; this ensures that '_Bool' promotes to 'int'. */
|
|
-#if !(defined __cplusplus || defined __BEOS__)
|
|
+#if !(defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__))
|
|
# if !@HAVE__BOOL@
|
|
# if defined __SUNPRO_C && (__SUNPRO_C < 0x550 || __STDC__ == 1)
|
|
/* Avoid stupid "warning: _Bool is a keyword in ISO C99". */
|
|
--- cvs-1.12.13/lib/getpass.c 2005-09-19 21:12:21.000000000 +0000
|
|
+++ cvs-1.12.13.patched/lib/getpass.c 2008-04-13 22:14:46.000000000 +0000
|
|
@@ -104,7 +104,7 @@
|
|
else
|
|
{
|
|
/* We do the locking ourselves. */
|
|
- __fsetlocking (tty, FSETLOCKING_BYCALLER);
|
|
+// __fsetlocking (tty, FSETLOCKING_BYCALLER);
|
|
|
|
out = in = tty;
|
|
}
|
|
--- cvs-1.12.13/src/buffer.c 2005-10-02 15:17:20.000000000 +0000
|
|
+++ cvs-1.12.13.patched/src/buffer.c 2008-04-13 22:18:11.000000000 +0000
|
|
@@ -2019,7 +2019,7 @@
|
|
&& sb.st_uid == devnull.st_uid
|
|
&& sb.st_gid == devnull.st_gid
|
|
&& sb.st_size == devnull.st_size
|
|
- && sb.st_blocks == devnull.st_blocks
|
|
+// && sb.st_blocks == devnull.st_blocks
|
|
&& sb.st_blksize == devnull.st_blksize);
|
|
if (isdevnull)
|
|
errno = 0;
|