main: rename systemd.default= to systemd.unit=

[elogind.git] / src / unit.h

diff --git a/src/unit.h b/src/unit.h
index fdf1b3691404d8bbfe97fa8dfabd1ae0cafa795c..5e61f7c027565deaae223a9ff69fc518fc3e22df 100644 (file)
--- a/src/unit.h
+++ b/src/unit.h
@@ -40,7 +40,7 @@ typedef enum UnitDependency UnitDependency;
 #include "execute.h"
 
 #define UNIT_NAME_MAX 128
-#define DEFAULT_TIMEOUT_USEC (20*USEC_PER_SEC)
+#define DEFAULT_TIMEOUT_USEC (60*USEC_PER_SEC)
 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
 
 typedef enum KillMode {
@@ -187,7 +187,7 @@ struct Meta {
 
         /* When deserializing, temporarily store the job type for this
          * unit here, if there was a job scheduled */
-        JobType deserialized_job;
+        int deserialized_job; /* This is actually of type JobType */
 
         bool in_load_queue:1;
         bool in_dbus_queue:1;