/[linux-patches]/genpatches-2.6/trunk/2.6.12-pre/1910_install-docs-2.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.12-pre/1910_install-docs-2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 4 - (show annotations) (download) (as text)
Sat Jun 11 23:20:41 2005 UTC (15 years, 5 months ago) by dsd
File MIME type: text/x-diff
File size: 1810 byte(s)
Create 2.6.12 branch
1 Date: Thu, 3 Mar 2005 11:41:21 +0100
2 Message-Id: <200503031041.j23AfLSx020688@faui31y.informatik.uni-erlangen.de>
3 From: Martin Waitz <tali@admingilde.org>
4 To: tali@admingilde.org
5 Cc: linux-kernel@vger.kernel.org
6 References: <20050303102852.GG8617@admingilde.org>
7 Subject: [PATCH 2/16] DocBook: allow preprocessor directives between kernel-doc and function
8
9 DocBook: allow preprocessor directives between kernel-doc and function
10 Signed-off-by: Martin Waitz <tali@admingilde.org>
11
12
13 # This is a BitKeeper generated patch for the following project:
14 # Project Name: Linux kernel tree
15 # This patch format is intended for GNU patch command version 2.5 or higher.
16 # This patch includes the following deltas:
17 # ChangeSet 1.2026 -> 1.2027
18 # scripts/kernel-doc 1.24 -> 1.25
19 #
20 # The following is the BitKeeper ChangeSet Log
21 # --------------------------------------------
22 # 05/01/26 tali@admingilde.org 1.2027
23 # DocBook: allow preprocessor directives between kernel-doc and function
24 #
25 # Signed-off-by: Martin Waitz <tali@admingilde.org>
26 # --------------------------------------------
27 #
28 diff -Nru a/scripts/kernel-doc b/scripts/kernel-doc
29 --- a/scripts/kernel-doc Thu Mar 3 11:41:25 2005
30 +++ b/scripts/kernel-doc Thu Mar 3 11:41:25 2005
31 @@ -1578,13 +1578,13 @@
32 my $x = shift;
33 my $file = shift;
34
35 - if ($x =~ m#\s*/\*\s+MACDOC\s*#io) {
36 + if ($x =~ m#\s*/\*\s+MACDOC\s*#io || ($x =~ /^#/ && $x !~ /^#define/)) {
37 # do nothing
38 }
39 elsif ($x =~ /([^\{]*)/) {
40 $prototype .= $1;
41 }
42 - if (($x =~ /\{/) || ($x =~ /\#/) || ($x =~ /;/)) {
43 + if (($x =~ /\{/) || ($x =~ /\#define/) || ($x =~ /;/)) {
44 $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
45 $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
46 $prototype =~ s@^\s+@@gos; # strip leading spaces
47

  ViewVC Help
Powered by ViewVC 1.1.20