diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-02 11:55:56 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-02 11:55:56 +0200 |
commit | 374b1f7583ad25bca0b801dd046ce8bfebd53bb0 (patch) | |
tree | 68cb00322f3bb815eb14c711f71eae2ff52e9ba0 /doc/user | |
parent | 7d409cbdf931289f934901eddd380e9e91734a54 (diff) | |
parent | 4112d19049e27162c333bac13d908f48a4cc438a (diff) |
merge brocken gbp import-orig
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/repositories.xml | 2 | ||||
-rw-r--r-- | doc/user/sconf.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/repositories.xml b/doc/user/repositories.xml index d828773..d8820d6 100644 --- a/doc/user/repositories.xml +++ b/doc/user/repositories.xml @@ -423,7 +423,7 @@ int main() { printf("Hello, world!\n"); } <para> Change all occurrences of <literal>#include "file.h"</literal> - to <literal>#include &lt;file.h&gt;</literal>. + to <literal>#include <file.h></literal>. Use of <literal>#include</literal> with angle brackets does not have the same behavior--the <literal>-I</literal> directories are searched first diff --git a/doc/user/sconf.xml b/doc/user/sconf.xml index 365aa22..9096aad 100644 --- a/doc/user/sconf.xml +++ b/doc/user/sconf.xml @@ -275,7 +275,7 @@ env = conf.Finish() <sconstruct> env = Environment() conf = Configure(env) -if not conf.CheckType('off_t', '#include &lt;sys/types.h&gt;\n'): +if not conf.CheckType('off_t', '#include <sys/types.h>\n'): print 'Did not find off_t typedef, assuming int' conf.env.Append(CCFLAGS = '-Doff_t=int') env = conf.Finish() @@ -324,7 +324,7 @@ scons: `.' is up to date. <sconstruct> mylib_test_source_file = """ -#include &lt;mylib.h&gt; +#include <mylib.h> int main(int argc, char **argv) { MyLibrary mylib(argc, argv); @@ -401,7 +401,7 @@ conf = Configure(env, custom_tests = {'CheckMyLibrary' : CheckMyLibrary}) <sconstruct> mylib_test_source_file = """ -#include &lt;mylib.h&gt; +#include <mylib.h> int main(int argc, char **argv) { MyLibrary mylib(argc, argv); |