summaryrefslogtreecommitdiff
path: root/sphinx/domains
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-01-13 00:14:00 +0100
committerGeorg Brandl <georg@python.org>2014-01-13 00:14:00 +0100
commit8aec27617e3ba2bf13ba9f96bb6fa57602f13b91 (patch)
treeb5a8bfe70f7ecd52ba3d64a19c375a5b8ac6288d /sphinx/domains
parent0ce3e1b81e8105ccf99e497b6c82c1ef8d9201ba (diff)
parentdd1c23518d9f91edeb5a19e796a5be2700c93f34 (diff)
downloadsphinx-8aec27617e3ba2bf13ba9f96bb6fa57602f13b91.tar.gz
merge with stable
Diffstat (limited to 'sphinx/domains')
-rw-r--r--sphinx/domains/c.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py
index f9f2e664..aed5b47e 100644
--- a/sphinx/domains/c.py
+++ b/sphinx/domains/c.py
@@ -59,7 +59,12 @@ class CObject(ObjectDescription):
# These C types aren't described anywhere, so don't try to create
# a cross-reference to them
- stopwords = set(('const', 'void', 'char', 'int', 'long', 'FILE', 'struct'))
+ stopwords = set((
+ 'const', 'void', 'char', 'wchar_t', 'int', 'short',
+ 'long', 'float', 'double', 'unsigned', 'signed', 'FILE',
+ 'clock_t', 'time_t', 'ptrdiff_t', 'size_t', 'ssize_t',
+ 'struct', '_Bool',
+ ))
def _parse_type(self, node, ctype):
# add cross-ref nodes for all words