1. clamav-devel
  2. Commit ce47ced01cdccd8620a2003e08c2b0127e8b7e39
Browse code

Adding static clamav-types.h for native Windows builds. Supporting changes to hashtab appear to be needed because cltypes.h no longer automatically brings in claamav-config.h.

Micah Snyder authored on 2018/12/08 06:00:54
Showing 4 changed files
libclamav/hashtab.c
History View file @ ce47ced
... ... 
@@ -24,13 +24,12 @@
24 24 
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
25 25 
  *  MA 02110-1301, USA.
26 26 
  */
27 
-#include <clamav-config.h>
28 
-
29 27 
 #include <stdlib.h>
30 28 
 #include <stdio.h>
31 29 
 #include <string.h>
32 30
33 31 
 #include "clamav.h"
32 
+#include "clamav-config.h"
34 33 
 #include "others.h"
35 34 
 #include "hashtab.h"
36 35
libclamav/hashtab.h
History View file @ ce47ced
... ... 
@@ -30,7 +30,9 @@
30 30 
 #include <stdio.h>
31 31 
 #include <stddef.h>
32 32 
 #include <sys/types.h>
33 
+
33 34 
 #include "clamav-types.h"
35 
+#include "clamav-config.h"
34 36 
 #include "mpool.h"
35 37 
 typedef long cli_element_data;
36 38
win32/clamav-config.h
History View file @ ce47ced
... ... 
@@ -419,10 +419,10 @@
419 419 
 /* #undef HAVE__INTERNAL__SHA_COLLECT */
420 420
421 421 
 /* "Full library version number" */
422 
-#define LIBCLAMAV_FULLVER "6.0.4"
422 
+#define LIBCLAMAV_FULLVER "9.0.1"
423 423
424 424 
 /* "Major library version number" */
425 
-#define LIBCLAMAV_MAJORVER 6
425 
+#define LIBCLAMAV_MAJORVER 9
426 426
427 427 
 /* Define if the OS needs help to load dependent libraries for dlopen(). */
428 428 
 /* #undef LTDL_DLOPEN_DEPLIBS */
win32/clamav-types.h
History View file @ ce47ced
429 429 
new file mode 100644
... ... 
@@ -0,0 +1,74 @@
0 
+/*
1 
+ *  Copyright (C) 2015-2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
2 
+ *  Copyright (C) 2007-2008 Sourcefire, Inc.
3 
+ *
4 
+ *  Authors: Tomasz Kojm, Micah Snyder
5 
+ *
6 
+ *  Nota bene: This file was constructed specifically for native Windows builds.
7 
+ *
8 
+ *  This program is free software; you can redistribute it and/or modify
9 
+ *  it under the terms of the GNU General Public License version 2 as
10 
+ *  published by the Free Software Foundation.
11 
+ *
12 
+ *  This program is distributed in the hope that it will be useful,
13 
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
14 
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15 
+ *  GNU General Public License for more details.
16 
+ *
17 
+ *  You should have received a copy of the GNU General Public License
18 
+ *  along with this program; if not, write to the Free Software
19 
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
20 
+ *  MA 02110-1301, USA.
21 
+ */
22 
+
23 
+#ifndef __CLAMAV_TYPES_H
24 
+#define __CLAMAV_TYPES_H
25 
+
26 
+/* <inttypes.h> was added in VS2013, but will
27 
+ * continue to use <stdint.h> for now. */
28 
+#include <stdint.h>
29 
+
30 
+/* Ensure we have print format types */
31 
+/* PRIu64 should be in <inttypes.h> */
32 
+#ifndef _SF64_PREFIX
33 
+    #define _SF64_PREFIX "ll"
34 
+#endif
35 
+
36 
+#ifndef PRIu64
37 
+    #define PRIu64 _SF64_PREFIX "u"
38 
+#endif
39 
+#ifndef PRIx64
40 
+    #define PRIx64 _SF64_PREFIX "i"
41 
+#endif
42 
+#ifndef PRIi64
43 
+    #define PRIi64 _SF64_PREFIX "x"
44 
+#endif
45 
+
46 
+#ifndef STDu64
47 
+    #define STDu64 "%" PRIu64
48 
+    #define STDi64 "%" PRIi64
49 
+    #define STDx64 "%" PRIx64
50 
+#endif
51 
+
52 
+/* PRIu32 should also be in <inttypes.h> */
53 
+#ifndef PRIu32
54 
+    #ifndef _SF32_PREFIX
55 
+        #define _SF32_PREFIX "l"
56 
+    #endif
57 
+
58 
+    #define PRIu32 _SF32_PREFIX "u"
59 
+    #define PRIi32 _SF32_PREFIX "i"
60 
+    #define PRIx32 _SF32_PREFIX "x"
61 
+#endif
62 
+
63 
+#ifndef STDu32
64 
+    #define STDu32 "%" PRIu32
65 
+    #define STDi32 "%" PRIi32
66 
+    #define STDx32 "%" PRIx32
67 
+#endif
68 
+
69 
+#ifndef INT32_MAX
70 
+    #define INT32_MAX 2147483647
71 
+#endif
72 
+
73 
+#endif