X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Funit.h;h=5e61f7c027565deaae223a9ff69fc518fc3e22df;hb=fc5df99e247b1bea9834b1e1e7b69ec6f955411e;hp=fdf1b3691404d8bbfe97fa8dfabd1ae0cafa795c;hpb=cca098b09535f58c638ed41310be60504be49bc4;p=elogind.git diff --git a/src/unit.h b/src/unit.h index fdf1b3691..5e61f7c02 100644 --- 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;