make include guard names consistent throughout the source and avoid conflicts with system headers

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1140 ef36b2f9-881f-0410-afb5-c4e39611909c

20 files changed, 59 insertions, 59 deletions

diff --git a/common/dict.h b/common/dict.h
index 52d4c2e..ee231e1 100644
--- a/common/dict.h
+++ b/common/dict.h
@@ -20,8 +20,8 @@
    02110-1301 USA
 */
 
-#ifndef _DICT_H
-#define _DICT_H
+#ifndef COMMON__DICT_H
+#define COMMON__DICT_H
 
 #include "compat/attrs.h"
 
@@ -64,4 +64,4 @@ void dict_free(DICT *dict);
 const char **dict_keys(DICT *dict)
   MUST_USE;
 
-#endif /* _DICT_H */
+#endif /* COMMON__DICT_H */
diff --git a/common/expr.h b/common/expr.h
index 9861a49..81b0e27 100644
--- a/common/expr.h
+++ b/common/expr.h
@@ -20,8 +20,8 @@
    02110-1301 USA
 */
 
-#ifndef _EXPR_H
-#define _EXPR_H 1
+#ifndef COMMON__EXPR_H
+#define COMMON__EXPR_H 1
 
 #include "compat/attrs.h"
 #include "common/set.h"
@@ -38,4 +38,4 @@ MUST_USE const char *expr_parse(const char *expr,char *buffer,size_t buflen,
    is allocated, otherwise the passed set is added to. */
 SET *expr_vars(const char *expr,SET *set);
 
-#endif /* not _EXPR_H */
+#endif /* not _COMMON__ */
diff --git a/common/nslcd-prot.h b/common/nslcd-prot.h
index ade9c7d..1252158 100644
--- a/common/nslcd-prot.h
+++ b/common/nslcd-prot.h
@@ -20,8 +20,8 @@
    02110-1301 USA
 */
 
-#ifndef _NSLCD_PROT_H
-#define _NSLCD_PROT_H 1
+#ifndef COMMON__NSLCD_PROT_H
+#define COMMON__NSLCD_PROT_H 1
 
 #include "tio.h"
 
@@ -355,4 +355,4 @@ TFILE *nslcd_client_open(void)
   if (tmpint32!=(int32_t)NSLCD_RESULT_BEGIN) \
     { ERROR_OUT_NOSUCCESS(fp) }
 
-#endif /* not _NSLCD_PROT_H */
+#endif /* not COMMON__NSLCD_PROT_H */
diff --git a/common/set.h b/common/set.h
index 111a2cc..5824bfc 100644
--- a/common/set.h
+++ b/common/set.h
@@ -20,8 +20,8 @@
    02110-1301 USA
 */
 
-#ifndef _SET_H
-#define _SET_H
+#ifndef COMMON__SET_H
+#define COMMON__SET_H
 
 #include "compat/attrs.h"
 
@@ -56,4 +56,4 @@ void set_free(SET *set);
 const char **set_tolist(SET *set)
   MUST_USE;
 
-#endif /* _SET_H */
+#endif /* COMMON__SET_H */
diff --git a/common/tio.h b/common/tio.h
index 25dbce9..22c099c 100644
--- a/common/tio.h
+++ b/common/tio.h
@@ -33,8 +33,8 @@
 
 */
 
-#ifndef _TIO_H
-#define _TIO_H
+#ifndef COMMON__TIO_H
+#define COMMON__TIO_H
 
 #include <sys/time.h>
 #include <sys/types.h>
@@ -78,4 +78,4 @@ void tio_mark(TFILE *fp);
    were full). */
 int tio_reset(TFILE *fp);
 
-#endif /* _TIO_H */
+#endif /* COMMON__TIO_H */
diff --git a/compat/attrs.h b/compat/attrs.h
index 492f45c..0bc0f30 100644
--- a/compat/attrs.h
+++ b/compat/attrs.h
@@ -19,8 +19,8 @@
    02110-1301 USA
 */
 
-#ifndef _COMPAT_ATTRS_H
-#define _COMPAT_ATTRS_H 1
+#ifndef COMPAT__ATTRS_H
+#define COMPAT__ATTRS_H 1
 
 /* macro for testing the version of GCC */
 #define GCC_VERSION(major,minor) \
@@ -88,4 +88,4 @@
 #endif /* not __STDC__ */
 #endif /* not __STRING */
 
-#endif /* not _COMPAT_ATTRS_H */
+#endif /* not COMPAT__ATTRS_H */
diff --git a/compat/daemon.h b/compat/daemon.h
index 4d0f33a..8d10514 100644
--- a/compat/daemon.h
+++ b/compat/daemon.h
@@ -19,8 +19,8 @@
    02110-1301 USA
 */
 
-#ifndef _DAEMON_H
-#define _DAEMON_H 1
+#ifndef COMPAT__DAEMON_H
+#define COMPAT__DAEMON_H 1
 
 #include <unistd.h>
 
@@ -28,4 +28,4 @@
    strdout and stderr and redirect them to /dev/null */
 int daemon(int nochdir,int noclose);
 
-#endif /* not _DAEMON_H */
+#endif /* not COMPAT__DAEMON_H */
diff --git a/compat/ether.h b/compat/ether.h
index fc1525e..40f1c8c 100644
--- a/compat/ether.h
+++ b/compat/ether.h
@@ -19,8 +19,8 @@
    02110-1301 USA
 */
 
-#ifndef _COMPAT_ETHER_H
-#define _COMPAT_ETHER_H 1
+#ifndef COMPAT__ETHER_H
+#define COMPAT__ETHER_H 1
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -45,5 +45,5 @@ char *ether_ntoa_r(const struct ether_addr *addr,char *buf);
 struct ether_addr *ether_aton_r(const char *asc,struct ether_addr *addr);
 #endif /* not HAVE_ETHER_ATON_R */
 
-#endif /* not _COMPAT_ETHER_H */
+#endif /* not COMPAT__ETHER_H */
 
diff --git a/compat/getopt_long.h b/compat/getopt_long.h
index 7ddf5a3..2500f64 100644
--- a/compat/getopt_long.h
+++ b/compat/getopt_long.h
@@ -19,8 +19,8 @@
    02110-1301 USA
 */
 
-#ifndef _GETOPT_LONG_H
-#define _GETOPT_LONG_H 1
+#ifndef COMPAT__GETOPT_LONG_H
+#define COMPAT__GETOPT_LONG_H 1
 
 #ifndef HAVE_GETOPT_LONG
 
@@ -47,4 +47,4 @@ int getopt_long(int argc,char * const argv[],
 
 #endif /* not HAVE_GETOPT_LONG */
 
-#endif /* _GETOPT_LONG_H */
+#endif /* COMPAT__GETOPT_LONG_H */
diff --git a/compat/getpeercred.h b/compat/getpeercred.h
index 73b3e26..afa049f 100644
--- a/compat/getpeercred.h
+++ b/compat/getpeercred.h
@@ -21,8 +21,8 @@
    02110-1301 USA
 */
 
-#ifndef _COMPAT_GETPEERCRED_H
-#define _COMPAT_GETPEERCRED_H 1
+#ifndef COMPAT__GETPEERCRED_H
+#define COMPAT__GETPEERCRED_H 1
 
 /* This function tries to determine the (effective) user id, group id
    and process id of the other end of the specified socket.
@@ -32,4 +32,4 @@
    is set appropriately. */
 int getpeercred(int sock,uid_t *uid,gid_t *gid,pid_t *pid);
 
-#endif /* not _COMPAT_GETPEERCRED_H */
+#endif /* not COMPAT__GETPEERCRED_H */
diff --git a/compat/ldap_compat.h b/compat/ldap_compat.h
index 19d9e07..15040c9 100644
--- a/compat/ldap_compat.h
+++ b/compat/ldap_compat.h
@@ -19,8 +19,8 @@
    02110-1301 USA
 */
 
-#ifndef _COMPAT_LDAP_COMPAT_H
-#define _COMPAT_LDAP_COMPAT_H 1
+#ifndef COMPAT__LDAP_COMPAT_H
+#define COMPAT__LDAP_COMPAT_H 1
 
 #include <lber.h>
 #include <ldap.h>
@@ -58,4 +58,4 @@ int ldap_passwd_s(LDAP *ld,struct berval *user,struct berval *oldpw,
 #endif /* not HAVE_LDAP_PASSWD_S */
 
 
-#endif /* _COMPAT_LDAP_COMPAT_H */
+#endif /* COMPAT__LDAP_COMPAT_H */
diff --git a/compat/pam_compat.h b/compat/pam_compat.h
index 7bb4081..d9410ad 100644
--- a/compat/pam_compat.h
+++ b/compat/pam_compat.h
@@ -19,8 +19,8 @@
    02110-1301 USA
 */
 
-#ifndef _COMPAT_PAM_COMPAT_H
-#define _COMPAT_PAM_COMPAT_H 1
+#ifndef COMPAT__PAM_COMPAT_H
+#define COMPAT__PAM_COMPAT_H 1
 
 #ifdef HAVE_SECURITY_PAM_APPL_H
 #include <security/pam_appl.h>
diff --git a/nslcd/attmap.h b/nslcd/attmap.h
index 480f290..dcfd0a4 100644
--- a/nslcd/attmap.h
+++ b/nslcd/attmap.h
@@ -20,8 +20,8 @@
    02110-1301 USA
 */
 
-#ifndef _ATTMAP_H
-#define _ATTMAP_H 1
+#ifndef NSLCD__ATTMAP_H
+#define NSLCD__ATTMAP_H 1
 
 #include "cfg.h"
 #include "myldap.h"
@@ -95,4 +95,4 @@ const char *attmap_get_value(MYLDAP_ENTRY *entry,const char *attr,char *buffer,s
    can either be an attribute or an attribute expression. */
 SET *attmap_add_attributes(SET *set,const char *attr);
 
-#endif /* not _ATTMAP_H */
+#endif /* not NSLCD__ATTMAP_H */
diff --git a/nslcd/cfg.h b/nslcd/cfg.h
index f32a500..8b30c14 100644
--- a/nslcd/cfg.h
+++ b/nslcd/cfg.h
@@ -23,8 +23,8 @@
    02110-1301 USA
 */
 
-#ifndef _CFG_H
-#define _CFG_H
+#ifndef NSLCD__CFG_H
+#define NSLCD__CFG_H
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -149,4 +149,4 @@ extern struct ldap_config *nslcd_cfg;
    if an error occurs. */
 void cfg_init(const char *fname);
 
-#endif /* _CFG_H */
+#endif /* NSLCD__CFG_H */
diff --git a/nslcd/common.h b/nslcd/common.h
index fafa25a..1b2aa1c 100644
--- a/nslcd/common.h
+++ b/nslcd/common.h
@@ -21,8 +21,8 @@
    02110-1301 USA
 */
 
-#ifndef _SERVER_COMMON_H
-#define _SERVER_COMMON_H 1
+#ifndef NSLCD__COMMON_H
+#define NSLCD__COMMON_H 1
 
 #include <errno.h>
 
@@ -195,4 +195,4 @@ int nslcd_pam_pwmod(TFILE *fp,MYLDAP_SESSION *session);
     return 0; \
   }
 
-#endif /* not _SERVER_COMMON_H */
+#endif /* not NSLCD__COMMON_H */
diff --git a/nslcd/log.h b/nslcd/log.h
index 43215de..3fa3d23 100644
--- a/nslcd/log.h
+++ b/nslcd/log.h
@@ -20,8 +20,8 @@
 */
 
 
-#ifndef _LOG_H
-#define _LOG_H 1
+#ifndef NSLCD__LOG_H
+#define NSLCD__LOG_H 1
 
 
 #include <syslog.h>
@@ -65,4 +65,4 @@ int log_getloglevel(const char *lvl)
   MUST_USE;
 
 
-#endif /* not _LOG_H */
+#endif /* not NSLCD__LOG_H */
diff --git a/nslcd/myldap.h b/nslcd/myldap.h
index 2ad90d9..0a3bd0b 100644
--- a/nslcd/myldap.h
+++ b/nslcd/myldap.h
@@ -32,8 +32,8 @@
    get attribute values (with myldap_get_values()).
 */
 
-#ifndef _MYLDAP_H
-#define _MYLDAP_H
+#ifndef NSLCD__MYLDAP_H
+#define NSLCD__MYLDAP_H
 
 /* for size_t */
 #include <stdlib.h>
@@ -139,4 +139,4 @@ int myldap_passwd(
         MYLDAP_SESSION *session,
         const char *userdn,const char *oldpassword,const char *newpasswd);
 
-#endif /* not _MYLDAP_H */
+#endif /* not NSLCD__MYLDAP_H */
diff --git a/nss/common.h b/nss/common.h
index 428d44e..bf7d67d 100644
--- a/nss/common.h
+++ b/nss/common.h
@@ -20,8 +20,8 @@
    02110-1301 USA
 */
 
-#ifndef _NSS_COMMON_H
-#define _NSS_COMMON_H 1
+#ifndef NSS__COMMON_H
+#define NSS__COMMON_H 1
 
 #include <stdio.h>
 #include <nss.h>
@@ -181,4 +181,4 @@
   } \
   return NSS_STATUS_SUCCESS;
 
-#endif /* not _NSS_COMMON_H */
+#endif /* not NSS__COMMON_H */
diff --git a/nss/prototypes.h b/nss/prototypes.h
index 9854933..7b82c27 100644
--- a/nss/prototypes.h
+++ b/nss/prototypes.h
@@ -20,8 +20,8 @@
    02110-1301 USA
 */
 
-#ifndef _NSS_EXPORTS_H
-#define _NSS_EXPORTS_H 1
+#ifndef NSS__PROTOTYPES_H
+#define NSS__PROTOTYPES_H 1
 
 #include <nss.h>
 #ifdef HAVE_ALIASES_H
@@ -172,4 +172,4 @@ enum nss_status _nss_ldap_setspent(int stayopen);
 enum nss_status _nss_ldap_getspent_r(struct spwd *result,char *buffer,size_t buflen,int *errnop);
 enum nss_status _nss_ldap_endspent(void);
 
-#endif /* not NSS_EXPORTS */
+#endif /* not NSS__PROTOTYPES_H */
diff --git a/pam/common.h b/pam/common.h
index 6dc8996..24dbf56 100644
--- a/pam/common.h
+++ b/pam/common.h
@@ -19,8 +19,8 @@
    02110-1301 USA
 */
 
-#ifndef _PAM_COMMON_H
-#define _PAM_COMMON_H 1
+#ifndef PAM__COMMON_H
+#define PAM__COMMON_H 1
 
 #include <stdio.h>
 
@@ -97,4 +97,4 @@
   READ_TYPE(fp,tmpint32,int32_t); \
   i=nslcd2pam_rc(tmpint32);
 
-#endif /* not _PAM_COMMON_H */
+#endif /* not PAM__COMMON_H */