fix last checkin

diff --git a/dmeventd/dmeventd.c b/dmeventd/dmeventd.c
index 8b642b931e4bec87c7cf501b25f65af775223171..2c9277984b4bb0413014c51c0dabdfedb1e5329b 100644 (file)
--- a/dmeventd/dmeventd.c
+++ b/dmeventd/dmeventd.c
@@ -40,6 +40,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+
+#include <sys/resource.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <arpa/inet.h> /* for htonl, ntohl */
@@ -1453,7 +1455,7 @@ int main(int argc, char *argv[])
 
        init_fifos(&fifos);
 
-       pthread_mutex_init(&mutex, NULL);
+       pthread_mutex_init(&_global_mutex, NULL);
 
 #ifdef MCL_CURRENT
        if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1)
@@ -1481,7 +1483,7 @@ int main(int argc, char *argv[])
 #ifdef MCL_CURRENT
        munlockall();
 #endif
-       pthread_mutex_destroy(&_mutex);
+       pthread_mutex_destroy(&_global_mutex);
 
        syslog(LOG_INFO, "dmeventd shutting down.");
        closelog();

diff --git a/lib/libdm-string.c b/lib/libdm-string.c
index 17defaca3b7929e2a31223cdf7c687326aecc333..098fc0d9d47392a7acbe8581234363a19d1a1b5d 100644 (file)
--- a/lib/libdm-string.c
+++ b/lib/libdm-string.c
@@ -126,6 +126,6 @@ char *dm_basename(const char *path)
 {
        char *p = strrchr(path, '/');
 
-       return p ? p + 1 : path;
+       return p ? p + 1 : (char *) path;
 }