@@ -1,3 +1,7 @@

+Tue Oct 14 21:08:10 EEST 2008 (edwin)

+-------------------------------------

+ * freshclam/manager.c: fix build on Solaris, fix compiler warning (bb #1234)

+

 Mon Oct 13 12:22:02 CEST 2008 (tk)

 ----------------------------------

   * clamd/server.h: drop dead code (bb#1231)

@@ -25,13 +25,17 @@

 #ifdef	_MSC_VER

 #include <winsock.h>	/* only needed in CL_EXPERIMENTAL */

 #endif

-

-#define _XOPEN_SOURCE 600

-

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

+/* for strptime, it is POSIX, but defining _XOPEN_SOURCE to 600

+ * fails on Solaris because it would require a c99 compiler,

+ * 500 fails completely on Solaris, and FreeBSD, and w/o _XOPEN_SOURCE

+ * strptime is not defined on Linux */

+#define _GNU_SOURCE

+#define __EXTENSIONS

+

 #include <stdio.h>

 #include <stdlib.h>

 #ifdef HAVE_UNISTD_H

@@ -585,7 +589,7 @@ int submitstats(const char *clamdcfg, const struct cfgstruct *copt)

 #endif

 	    *pt++ = 0;

 	if(!pt)

-	    pt = "NOFNAME";

+	    pt = (char*) "NOFNAME";

 	qcnt += snprintf(&query[qcnt], sizeof(query) - qcnt, "ts[]=%u&fname[]=%s&virus[]=%s&", (unsigned int) epoch, pt, pt2);

 	entries++;