diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-07-09 11:01:33 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-07-09 11:01:33 +0300 |
| commit | 03d95de7a0138354698772d9c393bcb4a71a4279 (patch) | |
| tree | f2b4fd9f2f7cfe8f094b50eec4788ca778f2fbb3 /rpmio | |
| parent | 60194412dadd4a0184f5100b7c6fe7d84a566f98 (diff) | |
| download | rpm-03d95de7a0138354698772d9c393bcb4a71a4279.tar.gz rpm-03d95de7a0138354698772d9c393bcb4a71a4279.tar.bz2 rpm-03d95de7a0138354698772d9c393bcb4a71a4279.zip | |
Fix include of misc.h, rpmpgp.h and rpmsq.h in C++.
Diffstat (limited to 'rpmio')
| -rw-r--r-- | rpmio/rpmpgp.h | 6 | ||||
| -rw-r--r-- | rpmio/rpmsq.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h index dd5d18b26..d90d4e73c 100644 --- a/rpmio/rpmpgp.h +++ b/rpmio/rpmpgp.h @@ -10,6 +10,8 @@ * Copyright (C) The Internet Society (1998). All Rights Reserved. */ +#include <string.h> + #if !defined(_BEECRYPT_API_H) /*@-redef@*/ typedef unsigned char byte; @@ -1314,9 +1316,9 @@ int pgpIsPkt(const byte * p) return 0; if (val & 0x40) - tag = (val & 0x3f); + tag = (pgpTag)(val & 0x3f); else - tag = (val >> 2) & 0xf; + tag = (pgpTag)((val >> 2) & 0xf); switch (tag) { case PGPTAG_MARKER: diff --git a/rpmio/rpmsq.h b/rpmio/rpmsq.h index 4223e42aa..f1ba5d4f7 100644 --- a/rpmio/rpmsq.h +++ b/rpmio/rpmsq.h @@ -58,7 +58,7 @@ extern rpmsq rpmsqQueue; extern sigset_t rpmsqCaught; #ifdef __cplusplus -{ +extern "C" { #endif /** |