diff options
| author | des <des@FreeBSD.org> | 2002-05-24 13:18:43 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-05-24 13:18:43 +0000 |
| commit | 658709f5bc0aa7ef8c87276699c29189ed3948cc (patch) | |
| tree | ad427719e2e0b91f72e147929569cf1f1ecd1f95 /contrib/openpam/include/security | |
| parent | d5f591c3abf029023df71a6a7fb0f8856d16fd6c (diff) | |
| download | FreeBSD-src-658709f5bc0aa7ef8c87276699c29189ed3948cc.zip FreeBSD-src-658709f5bc0aa7ef8c87276699c29189ed3948cc.tar.gz | |
Vendor import of OpenPAM Cinquefoil.
Diffstat (limited to 'contrib/openpam/include/security')
| -rw-r--r-- | contrib/openpam/include/security/openpam.h | 11 | ||||
| -rw-r--r-- | contrib/openpam/include/security/openpam_version.h | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/contrib/openpam/include/security/openpam.h b/contrib/openpam/include/security/openpam.h index e7bd8cb..16f3960 100644 --- a/contrib/openpam/include/security/openpam.h +++ b/contrib/openpam/include/security/openpam.h @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam.h#19 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#20 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -137,9 +137,12 @@ _openpam_log(int _level, const char *_fmt, ...); -#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L) -#define openpam_log(lvl, fmt, ...) \ - _openpam_log((lvl), __func__, fmt, __VA_ARGS__) +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) +#define openpam_log(lvl, ...) \ + _openpam_log((lvl), __func__, __VA_ARGS__) +#elif defined(__GNUC__) && (__GNUC__ >= 3) +#define openpam_log(lvl, ...) \ + _openpam_log((lvl), __func__, __VA_ARGS__) #elif defined(__GNUC__) && (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 95) #define openpam_log(lvl, fmt...) \ _openpam_log((lvl), __func__, ##fmt) diff --git a/contrib/openpam/include/security/openpam_version.h b/contrib/openpam/include/security/openpam_version.h index e69c4c3..969e719 100644 --- a/contrib/openpam/include/security/openpam_version.h +++ b/contrib/openpam/include/security/openpam_version.h @@ -31,14 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam_version.h#2 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#4 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20020414 -#define _OPENPAM_RELEASE "Cineraria" +#define _OPENPAM_VERSION 20020524 +#define _OPENPAM_RELEASE "Cinquefoil" #endif |
