diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-19 11:34:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:34:57 +0200 |
| commit | 8cd093f61168a373d919c68e0ce4e04949fa4eb6 (patch) | |
| tree | d1bc1dd33da84a22d6ab30aa9f7efb79b592ffda /openssl/crypto/pqueue/pqueue.h | |
| parent | 9fc852414dd4e841c4e2229f55a3e41abca64ac5 (diff) | |
| parent | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (diff) | |
| download | vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.gz vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.bz2 vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/crypto/pqueue/pqueue.h')
| -rw-r--r-- | openssl/crypto/pqueue/pqueue.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openssl/crypto/pqueue/pqueue.h b/openssl/crypto/pqueue/pqueue.h index 87fc9037c..26b534808 100644 --- a/openssl/crypto/pqueue/pqueue.h +++ b/openssl/crypto/pqueue/pqueue.h @@ -64,6 +64,9 @@ #include <stdlib.h> #include <string.h> +#ifdef __cplusplus +extern "C" { +#endif typedef struct _pqueue *pqueue; typedef struct _pitem @@ -91,4 +94,7 @@ pitem *pqueue_next(piterator *iter); void pqueue_print(pqueue pq); int pqueue_size(pqueue pq); +#ifdef __cplusplus +} +#endif #endif /* ! HEADER_PQUEUE_H */ |