Steven Morgan 55b8bf0c7b Resolve merge conflicts matcher-ac.c clamconf.c readdb.c

2015-02-03 19:37:12 -05:00

..

actions.c

bb#8993 - Rename the STAT macro to CLAMSTAT to avoid name conflicts on AIX

2013-09-25 16:23:10 -04:00

actions.h

…

cdiff.c

Finish phase 1 of silencing compiler warnings

2014-07-11 09:30:58 -04:00

cdiff.h

…

clamdcom.c

Finish phase 1 of silencing compiler warnings

2014-07-11 09:30:58 -04:00

clamdcom.h

…

fdpassing.h

…

getopt.c

getopt: Remove dead colon_mode init (value overwritten immediately)

2013-06-11 15:07:38 -04:00

getopt.h

…

Makefile.am

…

Makefile.in

Revert recent autoconf work

2014-06-27 12:22:04 -04:00

misc.c

Move all the crypto API to clamav.h

2014-07-01 19:38:01 -04:00

misc.h

Remove cfg_tcpsock function as it is now unused

2014-01-28 11:43:53 -05:00

optparser.c

Resolve merge conflicts matcher-ac.c clamconf.c readdb.c

2015-02-03 19:37:12 -05:00

optparser.h

bz11022 fix optparser name collisions for Mac OS X.

2014-06-03 17:06:12 -04:00

output.c

Move all the crypto API to clamav.h

2014-07-01 19:38:01 -04:00

output.h

bb #9053: ClamAV 0.98 can't be compiled on FreeBSD 7

2013-10-02 15:02:34 -04:00

queue.h

Only bring in <sys/cdefs.h> if it's available

2014-08-13 12:12:04 -04:00

tar.c

BB#3737 - Value too large for specified data type

2012-07-16 15:36:49 -04:00

tar.h

fix GCC warnings.

2012-05-30 13:37:32 +03:00