Browse code

Fix compilation problem on Cygwin

git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@785 77e5149b-7576-45b1-b177-96237e5ba77b

Nigel Horne authored on 2004/08/23 19:25:57
Showing 2 changed files
... ...
@@ -1,3 +1,7 @@
1
+Mon Aug 23 11:25:01 BST 2004 (njh)
2
+----------------------------------
3
+  * libclamav/blob.c:	Fix compilation error on Cygwin
4
+
1 5
 Sun Aug 22 21:20:43 BST 2004 (njh)
2 6
 ----------------------------------
3 7
   * libclamav/mbox.c:	All email attachments are now scanned, previously only
... ...
@@ -18,7 +22,7 @@ Sun Aug 22 14:18:53 CEST 2004 (tk)
18 18
 Sun Aug 22 11:35:30 BST 2004 (njh)
19 19
 ----------------------------------
20 20
   * libclamav:	Save email attachments to disc earlier (as the attachment is
21
-  			decoded rather than after decoding has finished), this
21
+			decoded rather than after decoding has finished), this
22 22
 			saves memory at a small speed penalty
23 23
 			Currently this is incompatible with FOLLOWURLS
24 24
 
... ...
@@ -35,7 +39,7 @@ Sat Aug 21 14:07:47 CEST 2004 (acab)
35 35
 Sat Aug 21 12:59:43 BST 2004 (njh)
36 36
 ----------------------------------
37 37
   * libclamav:	Changed the handling of miltipart messages, that is scanning
38
-  			emails with attachments. Reports on impact on memory
38
+			emails with attachments. Reports on impact on memory
39 39
 			usage and speed welcome to clamav-devel@clamav.net
40 40
 
41 41
 Fri Aug 20 21:05:04 CEST 2004 (tk)
... ...
@@ -101,7 +105,7 @@ Wed Aug 18 13:01:06 CEST 2004 (tk)
101 101
 Wed Aug 18 08:45:38 BST 2004 (njh)
102 102
 ----------------------------------
103 103
   * libclamav/mbox.c:	If CHECKURLS is compiled in, use libcurl automatically
104
-  				if it is detected
104
+				if it is detected
105 105
 
106 106
 Tue Aug 17 21:02:06 CEST 2004 (tk)
107 107
 ----------------------------------
... ...
@@ -16,6 +16,9 @@
16 16
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17 17
  *
18 18
  * $Log: blob.c,v $
19
+ * Revision 1.17  2004/08/23 10:23:58  nigelhorne
20
+ * Fix compilation problem on Cygwin
21
+ *
19 22
  * Revision 1.16  2004/08/22 15:08:58  nigelhorne
20 23
  * messageExport
21 24
  *
... ...
@@ -50,7 +53,7 @@
50 50
  * Change LOG to Log
51 51
  *
52 52
  */
53
-static	char	const	rcsid[] = "$Id: blob.c,v 1.16 2004/08/22 15:08:58 nigelhorne Exp $";
53
+static	char	const	rcsid[] = "$Id: blob.c,v 1.17 2004/08/23 10:23:58 nigelhorne Exp $";
54 54
 
55 55
 #if HAVE_CONFIG_H
56 56
 #include "clamav-config.h"
... ...
@@ -61,7 +64,7 @@ static	char	const	rcsid[] = "$Id: blob.c,v 1.16 2004/08/22 15:08:58 nigelhorne E
61 61
 #include <string.h>
62 62
 #include <errno.h>
63 63
 
64
-#include <sys/param.h>	/* for NAME_MAX */
64
+#include <sys/param.h>        /* for NAME_MAX */
65 65
 
66 66
 #if	C_DARWIN
67 67
 #include <sys/types.h>
... ...
@@ -75,6 +78,25 @@ static	char	const	rcsid[] = "$Id: blob.c,v 1.16 2004/08/22 15:08:58 nigelhorne E
75 75
 #define	NDEBUG	/* map CLAMAV debug onto standard */
76 76
 #endif
77 77
 
78
+/* Maximum filenames under various systems */
79
+#ifndef	NAME_MAX	/* e.g. Linux */
80
+
81
+#ifdef	MAXNAMELEN	/* e.g. Solaris */
82
+#define	NAME_MAX	MAXNAMELEN
83
+#else
84
+
85
+#ifdef	FILENAME_MAX	/* e.g. SCO */
86
+#define	NAME_MAX	FILENAME_MAX
87
+#endif
88
+
89
+#endif
90
+
91
+#endif
92
+
93
+#ifndef	O_BINARY
94
+#define	O_BINARY	0
95
+#endif
96
+
78 97
 #include <assert.h>
79 98
 
80 99
 blob *