nss-pam-ldapd commit: r1252 - nss-pam-ldapd/compat

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sun Oct 10 21:32:32 2010
New Revision: 1252
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1252

Log:
move missing declarations of ether_ntoa() and ether_aton() to header file so 
they are available for other sources also (r1243 from -solaris branch)

Modified:
   nss-pam-ldapd/compat/ether.c
   nss-pam-ldapd/compat/ether.h

Modified: nss-pam-ldapd/compat/ether.c
==============================================================================
--- nss-pam-ldapd/compat/ether.c        Sun Oct 10 21:31:44 2010        (r1251)
+++ nss-pam-ldapd/compat/ether.c        Sun Oct 10 21:32:32 2010        (r1252)
@@ -36,13 +36,6 @@
 /* these functions are not really reentrant */
 
 #ifndef HAVE_ETHER_NTOA_R
-
-#if !HAVE_DECL_ETHER_NTOA
-/* we define ether_ntoa() here because on some platforms the function is
-   underfined */
-extern char *ether_ntoa(const struct ether_addr *e);
-#endif /* not HAVE_DECL_ETHER_NTOA */
-
 char *ether_ntoa_r(const struct ether_addr *addr,char *buf)
 {
   char *tmp;
@@ -55,13 +48,6 @@
 #endif /* not HAVE_ETHER_NTOA_R */
 
 #ifndef HAVE_ETHER_ATON_R
-
-#if !HAVE_DECL_ETHER_ATON
-/* we define ether_aton() here because on some platforms the function is
-   underfined */
-extern struct ether_addr *ether_aton(const char *s);
-#endif /* not HAVE_DECL_ETHER_ATON */
-
 struct ether_addr *ether_aton_r(const char *asc,struct ether_addr *addr)
 {
   struct ether_addr *tmp;

Modified: nss-pam-ldapd/compat/ether.h
==============================================================================
--- nss-pam-ldapd/compat/ether.h        Sun Oct 10 21:31:44 2010        (r1251)
+++ nss-pam-ldapd/compat/ether.h        Sun Oct 10 21:32:32 2010        (r1252)
@@ -45,5 +45,20 @@
 struct ether_addr *ether_aton_r(const char *asc,struct ether_addr *addr);
 #endif /* not HAVE_ETHER_ATON_R */
 
-#endif /* not COMPAT__ETHER_H */
+#ifdef HAVE_ETHER_NTOA
+#if !HAVE_DECL_ETHER_NTOA
+/* we define ether_ntoa() here because on some platforms the function is
+   underfined */
+extern char *ether_ntoa(const struct ether_addr *e);
+#endif /* not HAVE_DECL_ETHER_NTOA */
+#endif /* HAVE_ETHER_NTOA */
+
+#ifdef HAVE_ETHER_ATON
+#if !HAVE_DECL_ETHER_ATON
+/* we define ether_aton() here because on some platforms the function is
+   underfined */
+extern struct ether_addr *ether_aton(const char *s);
+#endif /* not HAVE_DECL_ETHER_ATON */
+#endif /* HAVE_ETHER_ATON */
 
+#endif /* not COMPAT__ETHER_H */
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits