diff options
Diffstat (limited to 'libpam')
| -rw-r--r-- | libpam/Makefile.am | 4 | ||||
| -rw-r--r-- | libpam/include/security/_pam_types.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libpam/Makefile.am b/libpam/Makefile.am index 41a71869..5a5b94eb 100644 --- a/libpam/Makefile.am +++ b/libpam/Makefile.am @@ -1,8 +1,8 @@ # -# Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> # -AM_CFLAGS = -DDEFAULT_MODULE_PATH=\"$(SECUREDIR)/\" \ +AM_CFLAGS = -DDEFAULT_MODULE_PATH=\"$(SECUREDIR)/\" -DLIBPAM_COMPILE \ -I$(srcdir)/include $(LIBPRELUDE_CFLAGS) -DPAM_VERSION=\"$(VERSION)\" AM_LDFLAGS = $(LIBPRELUDE_LIBS) @LIBDL@ diff --git a/libpam/include/security/_pam_types.h b/libpam/include/security/_pam_types.h index 18f222db..85658f3b 100644 --- a/libpam/include/security/_pam_types.h +++ b/libpam/include/security/_pam_types.h @@ -156,7 +156,7 @@ typedef struct pam_handle pam_handle_t; # define PAM_FORMAT(params) #endif -#if PAM_GNUC_PREREQ(3,3) +#if PAM_GNUC_PREREQ(3,3) && !defined(LIBPAM_COMPILE) # define PAM_NONNULL(params) __attribute__((__nonnull__ params)) #else # define PAM_NONNULL(params) |