Attachment #497382 for bug #632658

View | Details | Raw Unified | Return to bug 632658
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-16 / +138 lines)
0	-- openrc-0.28/src/libeinfo/libeinfo.c	0	++ openrc-0.28-uclibc/src/libeinfo/libeinfo.c
Lines 29-34 const char libeinfo_copyright[] = "Copyr Link Here
29	#include <stdbool.h>	29	#include <stdbool.h>
30	#include <stdio.h>	30	#include <stdio.h>
31	#include <stdlib.h>	31	#include <stdlib.h>
		32	#ifdef __UCLIBC__
		33	# ifndef __USE_BSD
		34	# define __USE_BSD
		35	# endif
		36	#endif
32	#include <string.h>	37	#include <string.h>
33	#include <strings.h>	38	#include <strings.h>
34	#include <syslog.h>	39	#include <syslog.h>
35	-- openrc-0.28/src/librc/librc.h	40	++ openrc-0.28-uclibc/src/librc/librc.h
Lines 39-44 Link Here
39	#include <stdbool.h>	39	#include <stdbool.h>
40	#include <stdio.h>	40	#include <stdio.h>
41	#include <stdlib.h>	41	#include <stdlib.h>
		42	#ifdef __UCLIBC__
		43	# define __USE_BSD
		44	#endif
42	#include <string.h>	45	#include <string.h>
43	#include <strings.h>	46	#include <strings.h>
44	#include <time.h>	47	#include <time.h>
45	-- openrc-0.28/src/rc/_usage.c	48	++ openrc-0.28-uclibc/src/rc/_usage.c
Lines 13-18 Link Here
13	#include <ctype.h>	13	#include <ctype.h>
14	#include <stdio.h>	14	#include <stdio.h>
15	#include <stdlib.h>	15	#include <stdlib.h>
		16	#ifdef __UCLIBC__
		17	# ifndef __USE_BSD
		18	# define __USE_BSD
		19	# endif
		20	#endif
		21	#include <string.h>
16	#include "rc.h"	22	#include "rc.h"
17	#include "rc-misc.h"	23	#include "rc-misc.h"
18	#include "_usage.h"	24	#include "_usage.h"
19	-- openrc-0.28/src/rc/do_e.c	25	++ openrc-0.28-uclibc/src/rc/do_e.c
Lines 13-18 Link Here
13	#define SYSLOG_NAMES	13	#define SYSLOG_NAMES
14		14
15	#include <sys/types.h>	15	#include <sys/types.h>
		16	#ifdef __UCLIBC__
		17	# ifndef __USE_BSD
		18	# define __USE_BSD
		19	# endif
		20	#endif
16	#include <sys/time.h>	21	#include <sys/time.h>
17		22
18	#include <errno.h>	23	#include <errno.h>
Lines 20-27 Link Here
20	#include <inttypes.h>	25	#include <inttypes.h>
21	#include <stdbool.h>	26	#include <stdbool.h>
22	#include <stdio.h>	27	#include <stdio.h>
		28	#ifdef __UCLIBC__
		29	# ifdef __USE_BSD
		30	# undef __USE_BSD
		31	# endif
		32	#endif
23	#include <stdlib.h>	33	#include <stdlib.h>
24	#include <signal.h>	34	#include <signal.h>
		35	#ifdef __UCLIBC__
		36	# ifndef __USE_BSD
		37	# define __USE_BSD
		38	# endif
		39	#endif
25	#include <string.h>	40	#include <string.h>
26	#include <syslog.h>	41	#include <syslog.h>
27	#include <time.h>	42	#include <time.h>
28	-- openrc-0.28/src/rc/fstabinfo.c	43	++ openrc-0.28-uclibc/src/rc/fstabinfo.c
Lines 21-26 Link Here
21	#include <getopt.h>	21	#include <getopt.h>
22	#include <stdio.h>	22	#include <stdio.h>
23	#include <stdlib.h>	23	#include <stdlib.h>
		24	#ifdef __UCLIBC__
		25	# ifndef __USE_BSD
		26	# define __USE_BSD
		27	# endif
		28	#endif
24	#include <string.h>	29	#include <string.h>
25	#include <unistd.h>	30	#include <unistd.h>
26		31
27	-- openrc-0.28/src/rc/kill_all.c	32	++ openrc-0.28-uclibc/src/rc/kill_all.c
Lines 23-28 Link Here
23	#include <signal.h>	23	#include <signal.h>
24	#include <stdio.h>	24	#include <stdio.h>
25	#include <stdlib.h>	25	#include <stdlib.h>
		26	#ifdef __UCLIBC__
		27	# ifndef __USE_BSD
		28	# define __USE_BSD
		29	# endif
		30	#endif
26	#include <string.h>	31	#include <string.h>
27	#include <syslog.h>	32	#include <syslog.h>
28	#include <unistd.h>	33	#include <unistd.h>
29	-- openrc-0.28/src/rc/mountinfo.c	34	++ openrc-0.28-uclibc/src/rc/mountinfo.c
Lines 37-42 Link Here
37	#include <regex.h>	37	#include <regex.h>
38	#include <stdio.h>	38	#include <stdio.h>
39	#include <stdlib.h>	39	#include <stdlib.h>
		40	#ifdef __UCLIBC__
		41	# ifndef __USE_BSD
		42	# define __USE_BSD
		43	# endif
		44	#endif
40	#include <string.h>	45	#include <string.h>
41		46
42	#include "einfo.h"	47	#include "einfo.h"
43	-- openrc-0.28/src/rc/openrc-init.c	48	++ openrc-0.28-uclibc/src/rc/openrc-init.c
Lines 35-40 Link Here
35	#include "rc-wtmp.h"	35	#include "rc-wtmp.h"
36	#include "version.h"	36	#include "version.h"
37		37
		38	#ifndef RB_KEXEC
		39	# define RB_KEXEC 0x45584543
		40	#endif
		41
38	static const char *rc_default_runlevel = "default";	42	static const char *rc_default_runlevel = "default";
39		43
40	static pid_t do_openrc(const char *runlevel)	44	static pid_t do_openrc(const char *runlevel)
41	-- openrc-0.28/src/rc/openrc-run.c	45	++ openrc-0.28-uclibc/src/rc/openrc-run.c
Lines 33-38 Link Here
33	#include <signal.h>	33	#include <signal.h>
34	#include <stdio.h>	34	#include <stdio.h>
35	#include <stdlib.h>	35	#include <stdlib.h>
		36	#ifdef __UCLIBC__
		37	# ifndef __USE_BSD
		38	# define __USE_BSD
		39	# endif
		40	#endif
36	#include <string.h>	41	#include <string.h>
37	#include <termios.h>	42	#include <termios.h>
38	#include <time.h>	43	#include <time.h>
39	-- openrc-0.28/src/rc/rc-depend.c	44	++ openrc-0.28-uclibc/src/rc/rc-depend.c
Lines 26-31 Link Here
26	#include <stdbool.h>	26	#include <stdbool.h>
27	#include <stdio.h>	27	#include <stdio.h>
28	#include <stdlib.h>	28	#include <stdlib.h>
		29	#ifdef __UCLIBC__
		30	# ifndef __USE_BSD
		31	# define __USE_BSD
		32	# endif
		33	#endif
29	#include <string.h>	34	#include <string.h>
30	#include <time.h>	35	#include <time.h>
31	#include <unistd.h>	36	#include <unistd.h>
32	-- openrc-0.28/src/rc/rc-misc.c	37	++ openrc-0.28-uclibc/src/rc/rc-misc.c
Lines 30-35 Link Here
30	#include <signal.h>	30	#include <signal.h>
31	#include <stdio.h>	31	#include <stdio.h>
32	#include <stdlib.h>	32	#include <stdlib.h>
		33	#ifdef __UCLIBC__
		34	# ifndef __USE_BSD
		35	# define __USE_BSD
		36	# endif
		37	#endif
33	#include <string.h>	38	#include <string.h>
34	#include <time.h>	39	#include <time.h>
35	#include <unistd.h>	40	#include <unistd.h>
36	-- openrc-0.28/src/rc/rc-plugin.c	41	++ openrc-0.28-uclibc/src/rc/rc-plugin.c
Lines 26-31 Link Here
26	#include <signal.h>	26	#include <signal.h>
27	#include <stdio.h>	27	#include <stdio.h>
28	#include <stdlib.h>	28	#include <stdlib.h>
		29	#ifdef __UCLIBC__
		30	# ifndef __USE_BSD
		31	# define __USE_BSD
		32	# endif
		33	#endif
29	#include <string.h>	34	#include <string.h>
30	#include <unistd.h>	35	#include <unistd.h>
31		36
32	-- openrc-0.28/src/rc/rc.c	37	++ openrc-0.28-uclibc/src/rc/rc.c
Lines 40-45 const char rc_copyright[] = "Copyright ( Link Here
40	#include <stdio.h>	40	#include <stdio.h>
41	#include <stdlib.h>	41	#include <stdlib.h>
42	#include <signal.h>	42	#include <signal.h>
		43	#ifdef __UCLIBC__
		44	# ifndef __USE_BSD
		45	# define __USE_BSD
		46	# endif
		47	#endif
43	#include <string.h>	48	#include <string.h>
44	#include <strings.h>	49	#include <strings.h>
45	#include <termios.h>	50	#include <termios.h>
46	-- openrc-0.28/src/rc/start-stop-daemon.c	51	++ openrc-0.28-uclibc/src/rc/start-stop-daemon.c
Lines 42-55 Link Here
42	#include <fcntl.h>	42	#include <fcntl.h>
43	#include <getopt.h>	43	#include <getopt.h>
44	#include <limits.h>	44	#include <limits.h>
		45	#ifdef __UCLIBC__
		46	# ifndef __USE_BSD
		47	# define __USE_BSD
		48	# endif
		49	#endif
45	#include <grp.h>	50	#include <grp.h>
46	#include <pwd.h>	51	#include <pwd.h>
47	#include <signal.h>	52	#include <signal.h>
		53	#ifdef __UCLIBC__
		54	# ifndef NSIG
		55	# define NSIG _NSIG
		56	# endif
		57	#endif
48	#include <stddef.h>	58	#include <stddef.h>
49	#include <stdio.h>	59	#include <stdio.h>
		60	#ifdef __UCLIBC__
		61	# ifdef __USE_BSD
		62	# undef __USE_BSD
		63	# endif
		64	#endif
50	#include <stdlib.h>	65	#include <stdlib.h>
		66	#ifdef __UCLIBC__
		67	# ifndef __USE_BSD
		68	# define __USE_BSD
		69	# endif
		70	#endif
51	#include <string.h>	71	#include <string.h>
52	#include <time.h>	72	#include <time.h>
		73	#ifdef __UCLIBC__
		74	# ifdef __USE_MISC
		75	# define __USE_MISC
		76	# endif
		77	#endif
53	#include <unistd.h>	78	#include <unistd.h>
54		79
55	#ifdef HAVE_PAM	80	#ifdef HAVE_PAM
56	-- openrc-0.28/src/rc/supervise-daemon.c	81	++ openrc-0.28-uclibc/src/rc/supervise-daemon.c
Lines 39-53 Link Here
39	#include <fcntl.h>	39	#include <fcntl.h>
40	#include <getopt.h>	40	#include <getopt.h>
41	#include <limits.h>	41	#include <limits.h>
		42	#ifdef __UCLIBC__
		43	# ifndef __USE_BSD
		44	# define __USE_BSD
		45	# endif
		46	#endif
42	#include <grp.h>	47	#include <grp.h>
43	#include <pwd.h>	48	#include <pwd.h>
44	#include <signal.h>	49	#include <signal.h>
45	#include <stddef.h>	50	#include <stddef.h>
46	#include <stdio.h>	51	#include <stdio.h>
		52	#ifdef __UCLIBC__
		53	# ifdef __USE_BSD
		54	# undef __USE_BSD
		55	# endif
		56	#endif
47	#include <stdlib.h>	57	#include <stdlib.h>
		58	#ifdef __UCLIBC__
		59	# ifndef __USE_BSD
		60	# define __USE_BSD
		61	# endif
		62	#endif
48	#include <string.h>	63	#include <string.h>
49	#include <syslog.h>	64	#include <syslog.h>
50	#include <time.h>	65	#include <time.h>
		66	#ifdef __UCLIBC__
		67	# ifndef __USE_MISC
		68	# define __USE_MISC
		69	# endif
		70	#endif
51	#include <unistd.h>	71	#include <unistd.h>
52		72
53	#ifdef HAVE_PAM	73	#ifdef HAVE_PAM
54	-- openrc-0.28/src/rc/swclock.c	74	++ openrc-0.28-uclibc/src/rc/swclock.c
Lines 36-41 Link Here
36		36
37	#define RC_SHUTDOWNTIME RC_SVCDIR "/shutdowntime"	37	#define RC_SHUTDOWNTIME RC_SVCDIR "/shutdowntime"
38		38
		39	#ifdef __UCLIBC__
		40	extern int settimeofday (const struct timeval tv, const struct timezone tz);
		41	#endif
		42
39	const char *applet = NULL;	43	const char *applet = NULL;
40	const char *extraopts = "file";	44	const char *extraopts = "file";
41	const char *getoptstring = "sw" getoptstring_COMMON;	45	const char *getoptstring = "sw" getoptstring_COMMON;

Return to bug 632658