diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1997-07-10 07:37:00 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1997-07-10 07:37:00 +0000 |
| commit | 364f86b61444bab8bd64b0cab1ce9d3431aa0680 (patch) | |
| tree | ca5e1ca294e2e207f57b81e6683bb2d2dee34464 /devel/omniORB/files/patch-aa | |
| parent | Remove duplicate remsync menu entries so install-info won't barf up on (diff) | |
Put some parentheses in "#elif defined(foo) || defined(bar)" statement
to make this compile again. I never quite understood the "#elif"
syntax and now I think I never will.
By the way, this is just a patch-up to DavidO's "stab in the dark" and
is not guaranteed to work on NetBSD and/or OpenBSD. I just "fixed" it
in the way that it doesn't break FreeBSD while preserving the spirit
of his changes (i.e., to "stab" whatever he was aiming at).
Notes
Notes:
svn path=/head/; revision=7275
Diffstat (limited to '')
| -rw-r--r-- | devel/omniORB/files/patch-aa | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/devel/omniORB/files/patch-aa b/devel/omniORB/files/patch-aa index b067f79ced6f..e690cd380457 100644 --- a/devel/omniORB/files/patch-aa +++ b/devel/omniORB/files/patch-aa @@ -6,7 +6,7 @@ diff -rc ./Makefile ../omniORB_2.2.0.freebsd/Makefile --- 1,7 ---- + # Makefile for omniORB2 + # -+ # $Id: patch-aa,v 1.2 1997/06/04 05:57:29 asami Exp $ ++ # $Id: patch-aa,v 1.3 1997/06/29 12:13:21 obrien Exp $ + + SUBDIR= src + @@ -139,7 +139,7 @@ diff -rc ./src/Makefile ../omniORB_2.2.0.freebsd/src/Makefile --- 1,7 ---- ! # Makefile for omniORB2 ! # -! # $Id: patch-aa,v 1.2 1997/06/04 05:57:29 asami Exp $ +! # $Id: patch-aa,v 1.3 1997/06/29 12:13:21 obrien Exp $ ! SUBDIR= tool lib appl examples @@ -277,7 +277,7 @@ diff -rc ./src/appl/omniNames/log.cc ../omniORB_2.2.0.freebsd/src/appl/omniNames try { #ifdef __NT__ int fd = _open(active, O_WRONLY | O_CREAT | O_TRUNC, _S_IWRITE); -+ #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ #elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) + int fd = open(active, O_WRONLY | O_CREAT | O_TRUNC, 0666); #else int fd = open(active, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, 0666); @@ -288,7 +288,7 @@ diff -rc ./src/appl/omniNames/log.cc ../omniORB_2.2.0.freebsd/src/appl/omniNames #ifdef __NT__ int fd = _open(active, O_WRONLY | O_APPEND); -+ #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ #elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) + int fd = open(active, O_WRONLY | O_APPEND); #else int fd = open(active, O_WRONLY | O_APPEND | O_SYNC); @@ -299,7 +299,7 @@ diff -rc ./src/appl/omniNames/log.cc ../omniORB_2.2.0.freebsd/src/appl/omniNames #ifdef __NT__ int fd = _open(checkpt, O_WRONLY | O_CREAT | O_TRUNC, _S_IWRITE); -+ #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ #elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) + int fd = open(checkpt, O_WRONLY | O_CREAT | O_TRUNC, 0666); #else int fd = open(checkpt, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, 0666); @@ -310,7 +310,7 @@ diff -rc ./src/appl/omniNames/log.cc ../omniORB_2.2.0.freebsd/src/appl/omniNames #ifdef __NT__ fd = _open(active, O_WRONLY | O_APPEND); -+ #elif defined(__FreeBSD__) defined(__OpenBSD__) || defined(__NetBSD__) ++ #elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) + fd = open(active, O_WRONLY | O_APPEND); #else fd = open(active, O_WRONLY | O_APPEND | O_SYNC); @@ -1744,7 +1744,7 @@ diff -rc ./src/tool/Makefile ../omniORB_2.2.0.freebsd/src/tool/Makefile --- 1,7 ---- ! # Makefile for omniORB2 ! # -! # $Id: patch-aa,v 1.2 1997/06/04 05:57:29 asami Exp $ +! # $Id: patch-aa,v 1.3 1997/06/29 12:13:21 obrien Exp $ ! SUBDIR= omniidl2 |