summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Rigo <arigo@tunes.org>2019-11-03 07:30:48 +0100
committerArmin Rigo <arigo@tunes.org>2019-11-03 07:30:48 +0100
commitcd7bed8eea6be8fdd20bb572b4a536765269d39e (patch)
treed8856cae641808f07169d671d39472e0bc8cbab9
parent3123499e053f22f504eca0f1227196b95768941c (diff)
parente759e91bca5dd736bde6b3bcbe6e039bed9e310d (diff)
downloadcffi-cd7bed8eea6be8fdd20bb572b4a536765269d39e.tar.gz
hg merge default
-rw-r--r--cffi/cparser.py6
-rw-r--r--doc/source/installation.rst6
2 files changed, 6 insertions, 6 deletions
diff --git a/cffi/cparser.py b/cffi/cparser.py
index c275f42..ea27c48 100644
--- a/cffi/cparser.py
+++ b/cffi/cparser.py
@@ -159,9 +159,9 @@ def _warn_for_string_literal(csource):
def _warn_for_non_extern_non_static_global_variable(decl):
if not decl.storage:
import warnings
- warnings.warn("Declaration of global variable '%s' in cdef() should "
- "be marked 'extern' for consistency (or possibly "
- "'static' in API mode)" % (decl.name,))
+ warnings.warn("Global variable '%s' in cdef(): for consistency "
+ "with C it should have a storage class specifier "
+ "(usually 'extern')" % (decl.name,))
def _preprocess(csource):
# Remove comments. NOTE: this only work because the cdef() section
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 58a4900..3f365fc 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -54,11 +54,11 @@ Download and Installation:
* Checksums of the "source" package version 1.13.1:
- - MD5: ...
+ - MD5: 824ad9f228fbc6ce203c334e2ff4ab8f
- - SHA: ...
+ - SHA: 678dad3a3102ebcbeab8f5f132968afa444f6a54
- - SHA256: ...
+ - SHA256: 558b3afef987cf4b17abd849e7bedf64ee12b28175d564d05b628a0f9355599b
* Or grab the most current version from the `Bitbucket page`_:
``hg clone https://bitbucket.org/cffi/cffi``