Revert "Solving problems while compiling jack2 on macOS X with dbus s…

…upport (#434)"

Reduce code bloat by removing support of non-libre operating system

This reverts commit bb3f5cb.

dbus/controller.c

@@ -27,13 +27,13 @@
 #include <dbus/dbus.h>
 #include <assert.h>
 #include <unistd.h>
+#include <sys/sysinfo.h>
 #include <errno.h>
 
 #include "controller.h"
 #include "controller_internal.h"
 #include "xml.h"
 #include "reserve.h"
-#include "uptime.h"
 
 struct jack_dbus_interface_descriptor * g_jackcontroller_interfaces[] =
 {
@@ -787,18 +787,18 @@ void
 jack_controller_run(
     void * context)
 {
-    long ut;
+    struct sysinfo si;
 
     if (controller_ptr->pending_save == 0)
     {
         return;
     }
 
-    if ((ut = uptime()) < 0)
+    if (sysinfo(&si) != 0)
     {
-        jack_error(UPTIME_FUNCTION_NAME "() failed with %d", errno);
+        jack_error("sysinfo() failed with %d", errno);
     }
-    else if (ut < controller_ptr->pending_save + 2) /* delay save by two seconds */
+    else if (si.uptime < controller_ptr->pending_save + 2) /* delay save by two seconds */
     {
         return;
     }
@@ -813,15 +813,15 @@ void
 jack_controller_pending_save(
     struct jack_controller * controller_ptr)
 {
-    long ut;
+    struct sysinfo si;
 
-    if ((ut = uptime()) < 0)
+    if (sysinfo(&si) != 0)
     {
-        jack_error(UPTIME_FUNCTION_NAME "() failed with %d.", errno);
+        jack_error("sysinfo() failed with %d.", errno);
         controller_ptr->pending_save = 0;
         jack_controller_settings_save_auto(controller_ptr);
         return;
     }
 
-    controller_ptr->pending_save = ut;
+    controller_ptr->pending_save = si.uptime;
 }

dbus/wscript

@@ -79,9 +79,6 @@ def build(bld):
         'reserve.c',
         ]
     obj.use = ['JACKSERVER']
-    obj.source += [
-        '../linux/uptime.c',
-    ]
     if bld.env['IS_LINUX']:
         obj.use += ['PTHREAD', 'DL', 'RT', 'DBUS-1', 'EXPAT']
     if bld.env['IS_FREEBSD']: