diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-12-28 11:54:12 -0800 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-12-28 11:54:12 -0800 |
| commit | 15b90a7c0143e72bc4b40640bc70a510a781e5b3 (patch) | |
| tree | 633a65736cf0803249469d997d6673446ab6fa68 | |
| parent | 5785971c7f9a642e163e8e27e831d9af5e469339 (diff) | |
| parent | 9020b4845a8667a2f400a0fb1b5138cb8d51eaca (diff) | |
| download | cryptography-15b90a7c0143e72bc4b40640bc70a510a781e5b3.tar.gz cryptography-15b90a7c0143e72bc4b40640bc70a510a781e5b3.tar.bz2 cryptography-15b90a7c0143e72bc4b40640bc70a510a781e5b3.zip | |
Merge pull request #365 from public/const-string-literal
String literals are const char*.
| -rw-r--r-- | cryptography/hazmat/backends/openssl/opensslv.py | 2 | ||||
| -rw-r--r-- | docs/contributing.rst | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cryptography/hazmat/backends/openssl/opensslv.py b/cryptography/hazmat/backends/openssl/opensslv.py index 4e110327..397f4ca2 100644 --- a/cryptography/hazmat/backends/openssl/opensslv.py +++ b/cryptography/hazmat/backends/openssl/opensslv.py @@ -17,7 +17,7 @@ INCLUDES = """ TYPES = """ static const int OPENSSL_VERSION_NUMBER; -static char *const OPENSSL_VERSION_TEXT; +static const char *const OPENSSL_VERSION_TEXT; """ FUNCTIONS = """ diff --git a/docs/contributing.rst b/docs/contributing.rst index 63c99530..657c4359 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -141,17 +141,17 @@ this: .. code-block:: c - #define SOME_INTEGER 0x0; - #define SOME_UINTEGER (unsigned int)0x0001; - #define SOME_STRING "hello"; + #define SOME_INTEGER_LITERAL 0x0; + #define SOME_UNSIGNED_INTEGER_LITERAL 0x0001U; + #define SOME_STRING_LITERAL "hello"; ...it should be added to the bindings like so: .. code-block:: c - static const int SOME_INTEGER; - static const unsigned int SOME_UINTEGER; - static char *const SOME_STRING; + static const int SOME_INTEGER_LITERAL; + static const unsigned int SOME_UNSIGNED_INTEGER_LITERAL; + static const char *const SOME_STRING_LITERAL; Documentation ------------- |