git-svn: trunk@2688
Nigel Horne authored on 2007/02/10 02:58:00... | ... |
@@ -1,3 +1,7 @@ |
1 |
+Fri Feb 9 17:57:15 GMT 2007 (njh) |
|
2 |
+---------------------------------- |
|
3 |
+ * libclamav/lockdb.c: Fix compilation error, bug 234 |
|
4 |
+ |
|
1 | 5 |
Fri Feb 9 10:49:37 CET 2007 (tk) |
2 | 6 |
--------------------------------- |
3 | 7 |
* libclamav/entconv.c: fix whitespace normalization (bb#283), patch from Edwin |
... | ... |
@@ -30,6 +30,9 @@ |
30 | 30 |
* accesses. So, a simple mutual exclusion mechanism will suffice for both |
31 | 31 |
* the reader and writer locks on Windows. |
32 | 32 |
*/ |
33 |
+#ifdef _MSC_VER |
|
34 |
+#include <windows.h> |
|
35 |
+#endif |
|
33 | 36 |
|
34 | 37 |
#if HAVE_CONFIG_H |
35 | 38 |
#include "clamav-config.h" |
... | ... |
@@ -40,16 +43,14 @@ |
40 | 40 |
#include <stdlib.h> |
41 | 41 |
#include <string.h> |
42 | 42 |
#include <ctype.h> |
43 |
-#ifndef C_WINDOWS |
|
44 | 43 |
#ifdef HAVE_UNISTD_H |
45 | 44 |
#include <unistd.h> |
46 | 45 |
#endif |
47 |
-#include <fcntl.h> |
|
46 |
+#ifdef HAVE_SYS_STAT_H |
|
48 | 47 |
#include <sys/stat.h> |
49 |
-#include <errno.h> |
|
50 |
-#else |
|
51 |
-#include <windows.h> |
|
52 | 48 |
#endif |
49 |
+#include <fcntl.h> |
|
50 |
+#include <errno.h> |
|
53 | 51 |
|
54 | 52 |
#include "clamav.h" |
55 | 53 |
#include "others.h" |