timer.c		timer.c
	skipping to change at line 83		skipping to change at line 83
	}		}
	return 0;		return 0;
	}		}
	static int timer_add_default_dependencies(Timer *t) {		static int timer_add_default_dependencies(Timer *t) {
	int r;		int r;
	assert(t);		assert(t);
	if (UNIT(t)->manager->running_as == MANAGER_SYSTEM) {		if (UNIT(t)->manager->running_as == SYSTEMD_SYSTEM) {
	if ((r = unit_add_dependency_by_name(UNIT(t), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)		if ((r = unit_add_dependency_by_name(UNIT(t), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
	return r;		return r;
	if ((r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AF TER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)		if ((r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AF TER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
	return r;		return r;
	}		}
	return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT _CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);		return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT _CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
	}		}
	skipping to change at line 225		skipping to change at line 225
	else		else
	base = n;		base = n;
	break;		break;
	case TIMER_BOOT:		case TIMER_BOOT:
	/* CLOCK_MONOTONIC equals the uptime on Linux */		/* CLOCK_MONOTONIC equals the uptime on Linux */
	base = 0;		base = 0;
	break;		break;
	case TIMER_STARTUP:		case TIMER_STARTUP:
	base = UNIT(t)->manager->startup_timestamp.monotoni c;		base = UNIT(t)->manager->userspace_timestamp.monoto nic;
	break;		break;
	case TIMER_UNIT_ACTIVE:		case TIMER_UNIT_ACTIVE:
	if (UNIT_DEREF(t->unit)->inactive_exit_timestamp.mo notonic <= 0)		if (UNIT_DEREF(t->unit)->inactive_exit_timestamp.mo notonic <= 0)
	continue;		continue;
	base = UNIT_DEREF(t->unit)->inactive_exit_timestamp .monotonic;		base = UNIT_DEREF(t->unit)->inactive_exit_timestamp .monotonic;
	break;		break;
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/