Cosmetic changes to work on FreeBSD -- no <malloc.h>, cast of time()

diff --git a/org.glite.lb.common/src/il_msg.c b/org.glite.lb.common/src/il_msg.c
index dc07813..10f7a82 100644 (file)
--- a/org.glite.lb.common/src/il_msg.c
+++ b/org.glite.lb.common/src/il_msg.c
@@ -2,7 +2,7 @@
 
 #include "il_string.h"
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/org.glite.lb.common/src/lb_maildir.c b/org.glite.lb.common/src/lb_maildir.c
index d2ccf67..a221186 100644 (file)
--- a/org.glite.lb.common/src/lb_maildir.c
+++ b/org.glite.lb.common/src/lb_maildir.c
@@ -1,4 +1,3 @@
-#include <malloc.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -91,7 +90,7 @@ int edg_wll_MaildirStoreMsg(
                        snprintf(lbm_errdesc, MAX_ERR_LEN, "Maximum tries limit reached with unsuccessful file creation");
                        return -1;
                }
-               snprintf(fname, PATH_MAX, "%s/%s/%ld.%d.%s", root, dirs[LBMD_DIR_TMP], time(NULL), getpid(), srvname);
+               snprintf(fname, PATH_MAX, "%s/%s/%ld.%d.%s", root, dirs[LBMD_DIR_TMP], (long) time(NULL), getpid(), srvname);
                if ( (fhnd = open(fname, O_CREAT|O_EXCL|O_WRONLY, 00600)) < 0 ) {
                        if ( errno == EEXIST ) { sleep(2); continue; }
                        snprintf(lbm_errdesc, MAX_ERR_LEN, "Can't create file %s", fname);