Browse code

Fix win32 build (bb #1824).

Török Edvin authored on 2010/02/10 17:22:07
Showing 3 changed files
... ...
@@ -292,7 +292,7 @@ enum badness {
292 292
 	avoid_anywhere, /* includes avoid_first! */
293 293
 	/* not that bad, but still not best */
294 294
 	dontlike,
295
-	accept,
295
+	acceptable,
296 296
 	like
297 297
 };
298 298
 static inline void get_score(enum badness badness, unsigned i, const struct filter *m, const struct char_spec *spec0, const struct char_spec *spec1, int32_t *score, int32_t *score_end)
... ...
@@ -320,7 +320,7 @@ static inline void get_score(enum badness badness, unsigned i, const struct filt
320 320
 		case dontlike:
321 321
 			base = 0;
322 322
 			break;
323
-		case accept:
323
+		case acceptable:
324 324
 			base = 0x200;
325 325
 			break;
326 326
 		case like:
... ...
@@ -496,7 +496,7 @@ int  filter_add_acpatt(struct filter *m, const struct cli_ac_patt *pat)
496 496
 				char_badness[i] = avoid_anywhere;
497 497
 		} else {
498 498
 			int8_t binary = 0;
499
-			enum badness scor = accept;
499
+			enum badness scor = acceptable;
500 500
 			for(k0=spec0->start;k0 <= spec0->end;k0 += spec0->step) {
501 501
 				for(k1=spec1->start;k1 <= spec1->end;k1 += spec1->step) {
502 502
 					unsigned char c0 = spec_ith_char(spec0, k0);
... ...
@@ -513,7 +513,7 @@ int  filter_add_acpatt(struct filter *m, const struct cli_ac_patt *pat)
513 513
 						binary = 1;
514 514
 				}
515 515
 			}
516
-			if (scor == accept && binary) {
516
+			if (scor == acceptable && binary) {
517 517
 				/* slightly favor binary */
518 518
 				scor = like;
519 519
 			}
... ...
@@ -543,7 +543,7 @@ int  filter_add_acpatt(struct filter *m, const struct cli_ac_patt *pat)
543 543
 		while ((kend > i+3) && char_badness[kend-1] == reject) kend--;
544 544
 		for (k=i;k<kend;k++) {
545 545
 			enum badness badness = char_badness[k];
546
-			if (badness < accept) {
546
+			if (badness < acceptable) {
547 547
 				if (badness == reject) {
548 548
 					/* this is a never pick */
549 549
 					kend = k;
... ...
@@ -493,7 +493,7 @@
493 493
 /* #undef USE_SYSLOG */
494 494
 
495 495
 /* Version number of package */
496
-#define VERSION "devel-r5076-723-ge4bf8f9"
496
+#define VERSION "devel-r5076-766-g7af2e27"
497 497
 
498 498
 /* Version suffix for package */
499 499
 #define VERSION_SUFFIX ""
... ...
@@ -185,6 +185,14 @@
185 185
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
186 186
 			>
187 187
 			<File
188
+				RelativePath="..\libclamav\filtering.c"
189
+				>
190
+			</File>
191
+			<File
192
+				RelativePath="..\libclamav\perflogging.c"
193
+				>
194
+			</File>
195
+			<File
188 196
 				RelativePath="..\libclamav\7z.c"
189 197
 				>
190 198
 			</File>