diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-06-30 06:58:59 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-06-30 06:58:59 +0000 |
| commit | 272a2055ab3114ba4a114f8ceb48be1d58933028 (patch) | |
| tree | e35e4f58df8b9b618df0f9855582071721321781 /mergecap.c | |
| parent | 24527148ab2dc1e052ebe3679d5277cc68bfeb47 (diff) | |
On at least some platforms, a #define of O_BINARY is needed even if
<fcntl.h> is included, as <fcntl.h> doesn't define it.
svn path=/trunk/; revision=11276
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c index 8038e70fb4..aa31504dcd 100644 --- a/mergecap.c +++ b/mergecap.c @@ -1,6 +1,6 @@ /* Combine two dump files, either by appending or by merging by timestamp * - * $Id: mergecap.c,v 1.22 2004/06/29 20:59:23 ulfl Exp $ + * $Id: mergecap.c,v 1.23 2004/06/30 06:58:57 guy Exp $ * * Written by Scott Renfro <scott@renfro.org> based on * editcap by Richard Sharpe and Guy Harris @@ -41,6 +41,10 @@ #include <fcntl.h> #endif +/* Win32 needs the O_BINARY flag for open() */ +#ifndef O_BINARY +#define O_BINARY 0 +#endif /* * Show the usage |