Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 654ef002 654ef002a4b856420b40f8bda754e912ec301ff3 by Sergey Poznyakoff
Options

Remove conflict markers

1 parent 90ee38e9
Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2005, 2007 Free Software Foundation, Inc.
2 Copyright (C) 1999, 2000, 2001, 2005, 2007 Free Software Foundation, Inc. 3 Copyright (C) 1999, 2000, 2001, 2005, 2007 Free Software Foundation, Inc.
3 4
4 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
...@@ -38,7 +39,7 @@ extern "C" { /*}*/ ...@@ -38,7 +39,7 @@ extern "C" { /*}*/
38 #define MU_STREAM_SEEKABLE 0x00000080 39 #define MU_STREAM_SEEKABLE 0x00000080
39 #define MU_STREAM_NO_CLOSE 0x00000100 40 #define MU_STREAM_NO_CLOSE 0x00000100
40 #define MU_STREAM_ALLOW_LINKS 0x00000200 41 #define MU_STREAM_ALLOW_LINKS 0x00000200
41 #define MU_STREAM_STRICT 0x00000400 42 #define MU_STREAM_NONLOCK 0x00000400
42 43
43 /* Functions useful to users of the pre-defined stream types. */ 44 /* Functions useful to users of the pre-defined stream types. */
44 45
......