Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in portage-utils: main.c main.h
Date: Wed, 30 Mar 2011 05:33:29
Message-Id: 20110330053319.5A0D620054@flycatcher.gentoo.org
1 vapier 11/03/30 05:33:19
2
3 Modified: main.c main.h
4 Log:
5 move _q_static setup to main.h and drop useless _GNU_SOURCE here (needs to be before all C lib includes)
6
7 Revision Changes Path
8 1.193 portage-utils/main.c
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.193&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.193&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?r1=1.192&r2=1.193
13
14 Index: main.c
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
17 retrieving revision 1.192
18 retrieving revision 1.193
19 diff -u -r1.192 -r1.193
20 --- main.c 17 Mar 2011 03:19:50 -0000 1.192
21 +++ main.c 30 Mar 2011 05:33:19 -0000 1.193
22 @@ -1,7 +1,7 @@
23 /*
24 * Copyright 2005-2008 Gentoo Foundation
25 * Distributed under the terms of the GNU General Public License v2
26 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.192 2011/03/17 03:19:50 vapier Exp $
27 + * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.193 2011/03/30 05:33:19 vapier Exp $
28 *
29 * Copyright 2005-2008 Ned Ludd - <solar@g.o>
30 * Copyright 2005-2008 Mike Frysinger - <vapier@g.o>
31 @@ -11,9 +11,6 @@
32 #ifdef _AIX
33 #define _LINUX_SOURCE_COMPAT
34 #endif
35 -#ifndef _q_static
36 -# define _q_static static
37 -#endif
38
39 #include <stdarg.h>
40 #include <stdio.h>
41
42
43
44 1.8 portage-utils/main.h
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.h?rev=1.8&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.h?rev=1.8&content-type=text/plain
48 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.h?r1=1.7&r2=1.8
49
50 Index: main.h
51 ===================================================================
52 RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.h,v
53 retrieving revision 1.7
54 retrieving revision 1.8
55 diff -u -r1.7 -r1.8
56 --- main.h 21 Feb 2011 21:52:55 -0000 1.7
57 +++ main.h 30 Mar 2011 05:33:19 -0000 1.8
58 @@ -1,13 +1,15 @@
59 /*
60 * Copyright 2005-2010 Gentoo Foundation
61 * Distributed under the terms of the GNU General Public License v2
62 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.h,v 1.7 2011/02/21 21:52:55 vapier Exp $
63 + * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.h,v 1.8 2011/03/30 05:33:19 vapier Exp $
64 *
65 * Copyright 2005-2010 Ned Ludd - <solar@g.o>
66 * Copyright 2005-2010 Mike Frysinger - <vapier@g.o>
67 */
68
69 -#define _GNU_SOURCE
70 +#ifndef _q_static
71 +# define _q_static static
72 +#endif
73
74 /* make sure our buffers are as big as they can be */
75 #if PATH_MAX > _POSIX_PATH_MAX /* _Q_PATH_MAX */