Fixes Solaris build warnings
authorMark Michelson <mmichelson@digium.com>
Wed, 12 Sep 2007 16:24:45 +0000 (16:24 +0000)
committerMark Michelson <mmichelson@digium.com>
Wed, 12 Sep 2007 16:24:45 +0000 (16:24 +0000)
(closes issue #10698, reported and patched by snuffy)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82283 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/app.c
main/asterisk.c
main/pbx.c

index a026f2b..0d6d966 100644 (file)
@@ -39,6 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <regex.h>
+#include <fcntl.h>
 
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
@@ -1146,8 +1147,14 @@ static enum AST_LOCK_RESULT ast_lock_path_flock(const char *path)
        pl->path = strdup(path);
 
        time(&start);
-       while (((res = flock(pl->fd, LOCK_EX | LOCK_NB)) < 0) &&
-                       (errno == EWOULDBLOCK) && (time(NULL) - start < 5))
+       while ((
+               #ifdef SOLARIS
+               (res = fcntl(pl->fd, F_SETLK, fcntl(pl->fd,F_GETFL)|O_NONBLOCK)) < 0) &&
+               #else
+               (res = flock(pl->fd, LOCK_EX | LOCK_NB)) < 0) &&
+               #endif
+                       (errno == EWOULDBLOCK) && 
+                       (time(NULL) - start < 5))
                usleep(1000);
        if (res) {
                ast_log(LOG_WARNING, "Failed to lock path '%s': %s\n",
index 7a4acf6..ce6cedf 100644 (file)
@@ -95,6 +95,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netdb.h>
 #if defined(SOLARIS)
 int daemon(int, int);  /* defined in libresolv of all places */
+#include <sys/loadavg.h>
 #endif
 #endif
 
index 666f334..c879c58 100644 (file)
@@ -40,6 +40,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>
 #endif
+#if defined(SOLARIS)
+#include <sys/loadavg.h>
+#endif
 
 #include "asterisk/lock.h"
 #include "asterisk/cli.h"