Minor fixes from jon@symas.com

diff --git a/libraries/liblutil/uuid.c b/libraries/liblutil/uuid.c
index 0775edf00a40a59986b8e84bc444763247631835..7497c96888cc8ef92126631e2e9713a2e4abfd1b 100644 (file)
--- a/libraries/liblutil/uuid.c
+++ b/libraries/liblutil/uuid.c
@@ -27,8 +27,8 @@
 #else
 #  include <ac/socket.h>
 #  include <ac/time.h>
-#  include <net/if.h>
 #  ifdef HAVE_SYS_SYSCTL_H
+#    include <net/if.h>
 #    include <sys/sysctl.h>
 #    include <net/route.h>
 #  endif

diff --git a/libraries/librewrite/map.c b/libraries/librewrite/map.c
index c1fc47d3a8be582f7957f067d63a9b1df1c4d1ee..9fbf330c3c2189a4d196f87753a53adc05c34b4b 100644 (file)
--- a/libraries/librewrite/map.c
+++ b/libraries/librewrite/map.c
@@ -24,7 +24,9 @@
 
 #include <portable.h>
 
+#ifdef HAVE_PWD_H
 #include <pwd.h>
+#endif
 
 #include "rewrite-int.h"
 #include "rewrite-map.h"
@@ -519,6 +521,7 @@ rewrite_xmap_apply(
        val->bv_len = 0;
        
        switch ( map->lm_type ) {
+#ifdef HAVE_GETPWNAM
        case REWRITE_MAP_XPWDMAP: {
                struct passwd *pwd;
 
@@ -562,6 +565,7 @@ rewrite_xmap_apply(
                        
                break;
        }
+#endif /* HAVE_GETPWNAM*/
        
        case REWRITE_MAP_XFILEMAP: {
                char buf[1024];