aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/gendoc.py18
-rw-r--r--unix/modffi.c2
2 files changed, 12 insertions, 8 deletions
diff --git a/tools/gendoc.py b/tools/gendoc.py
index 5a33a8195..727bc60d7 100644
--- a/tools/gendoc.py
+++ b/tools/gendoc.py
@@ -228,16 +228,18 @@ class DocModule(DocItem):
s.append('# module {}'.format(self.name))
s.append('')
s.append(super().dump())
- s.append('')
- s.append('## Functions')
- for f in sorted(self.functions.values(), key=lambda x:x.name):
+ if self.functions:
s.append('')
- s.append(f.dump(self.name))
- s.append('')
- s.append('## Classes')
- for c in sorted(self.classes.values(), key=lambda x:x.name):
+ s.append('## Functions')
+ for f in sorted(self.functions.values(), key=lambda x:x.name):
+ s.append('')
+ s.append(f.dump(self.name))
+ if self.classes:
s.append('')
- s.append('[`{}.{}`]({}) - {}'.format(self.name, c.name, c.name, c.descr))
+ s.append('## Classes')
+ for c in sorted(self.classes.values(), key=lambda x:x.name):
+ s.append('')
+ s.append('[`{}.{}`]({}) - {}'.format(self.name, c.name, c.name, c.descr))
return '\n'.join(s)
def write(self, dir):
diff --git a/unix/modffi.c b/unix/modffi.c
index f1b219987..48666aef0 100644
--- a/unix/modffi.c
+++ b/unix/modffi.c
@@ -100,6 +100,8 @@ STATIC ffi_type *char2ffi_type(char c)
switch (c) {
case 'b': return &ffi_type_schar;
case 'B': return &ffi_type_uchar;
+ case 'h': return &ffi_type_sshort;
+ case 'H': return &ffi_type_ushort;
case 'i': return &ffi_type_sint;
case 'I': return &ffi_type_uint;
case 'l': return &ffi_type_slong;