Merge pull request #10811 from keszybz/define-main-through-macro

author Lennart Poettering <lennart@poettering.net>

Mon, 19 Nov 2018 14:28:17 +0000 (15:28 +0100)

committer GitHub <noreply@github.com>

Mon, 19 Nov 2018 14:28:17 +0000 (15:28 +0100)
author Lennart Poettering <lennart@poettering.net>
Mon, 19 Nov 2018 14:28:17 +0000 (15:28 +0100)
committer GitHub <noreply@github.com>
Mon, 19 Nov 2018 14:28:17 +0000 (15:28 +0100)
diff --cc src/basic/macro.h
Simple merge
diff --cc src/cgtop/cgtop.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Mon, 19 Nov 2018 14:28:17 +0000 (15:28 +0100)
committer	GitHub <noreply@github.com>
	Mon, 19 Nov 2018 14:28:17 +0000 (15:28 +0100)
		1	2
src/basic/macro.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/cgtop/cgtop.c	patch \|	diff1 \|	diff2 \|	blob \| history