haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

This patch is basically the same as the one that was posted prior to this for cvs-1.12.13, except this one was created with the diff command instead of patches together from three files, hopefully this fixes trac not being able to display it correctly.

Browse Source
This commit is contained in:
Scott McCreary
2008-09-29 19:26:17 +00:00
parent 076cc5df7c
commit a6533c0793
1 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
dev-util/cvs/cvs-1.12.13-haiku.diff Normal file
View File

@@ -0,0 +1,45 @@
diff -urN cvs-1.12.13/lib/getpass.c cvs-1.12.13-haiku/lib/getpass.c
--- cvs-1.12.13/lib/getpass.c 2005-09-19 21:12:21.000000000 +0000
+++ cvs-1.12.13-haiku/lib/getpass.c 2008-09-29 12:14:49.000000000 +0000
@@ -104,7 +104,7 @@
else
{
/* We do the locking ourselves. */
- __fsetlocking (tty, FSETLOCKING_BYCALLER);
+// __fsetlocking (tty, FSETLOCKING_BYCALLER);
out = in = tty;
}
diff -urN cvs-1.12.13/lib/stdbool_.h cvs-1.12.13-haiku/lib/stdbool_.h
--- cvs-1.12.13/lib/stdbool_.h 2005-05-23 17:44:32.000000000 +0000
+++ cvs-1.12.13-haiku/lib/stdbool_.h 2008-09-29 12:03:52.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". */
diff -urN cvs-1.12.13/src/buffer.c cvs-1.12.13-haiku/src/buffer.c
--- cvs-1.12.13/src/buffer.c 2005-10-02 15:17:20.000000000 +0000
+++ cvs-1.12.13-haiku/src/buffer.c 2008-09-29 12:16:37.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;