diff options
Diffstat (limited to 'libpam/include')
| -rw-r--r-- | libpam/include/security/_pam_macros.h | 2 | ||||
| -rw-r--r-- | libpam/include/security/_pam_types.h | 5 | ||||
| -rw-r--r-- | libpam/include/security/pam_malloc.h | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/libpam/include/security/_pam_macros.h b/libpam/include/security/_pam_macros.h index 2827fabf..e328d989 100644 --- a/libpam/include/security/_pam_macros.h +++ b/libpam/include/security/_pam_macros.h @@ -9,8 +9,8 @@ /* a 'safe' version of strdup */ -#include <string.h> #include <stdlib.h> +#include <string.h> #define x_strdup(s) ( (s) ? strdup(s):NULL ) diff --git a/libpam/include/security/_pam_types.h b/libpam/include/security/_pam_types.h index a48a7942..366b7e04 100644 --- a/libpam/include/security/_pam_types.h +++ b/libpam/include/security/_pam_types.h @@ -14,11 +14,6 @@ #ifndef _SECURITY__PAM_TYPES_H #define _SECURITY__PAM_TYPES_H -#ifndef __LIBPAM_VERSION -# define __LIBPAM_VERSION __libpam_version -#endif -extern unsigned int __libpam_version; - /* * include local definition for POSIX - NULL */ diff --git a/libpam/include/security/pam_malloc.h b/libpam/include/security/pam_malloc.h index cc95d7de..05ca16f0 100644 --- a/libpam/include/security/pam_malloc.h +++ b/libpam/include/security/pam_malloc.h @@ -18,11 +18,9 @@ #define malloc(s) pam_malloc(s,__FILE__,__FUNCTION__,__LINE__) #define calloc(n,s) pam_calloc(n,s,__FILE__,__FUNCTION__,__LINE__) #define free(x) pam_free(x,__FILE__,__FUNCTION__,__LINE__) -/* #define memalign(a,s) pam_memalign(a,s,__FILE__,__FUNCTION__,__LINE__) */ #define realloc(x,s) pam_realloc(x,s,__FILE__,__FUNCTION__,__LINE__) -/* #define valloc(s) pam_valloc(s,__FILE__,__FUNCTION__,__LINE__) */ -/* #define alloca(s) pam_alloca(s,__FILE__,__FUNCTION__,__LINE__) */ #define exit(i) pam_exit(i,__FILE__,__FUNCTION__,__LINE__) +#undef strdup #define strdup(s) pam_strdup(s,__FILE__,__FUNCTION__,__LINE__) /* these are the prototypes for the wrapper functions */ |