3 files changed, 11 insertions, 11 deletions
diff --git a/epoc/config.sh b/epoc/config.sh
index 83673efee7..b5a533f14a 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -33,8 +33,8 @@ apirevision=''
 apisubversion=''
 apiversion=''
 ar='arm-epoc-pe-ar'
-archlib='/usr/lib/perl/5.7.3/epoc'
-archlibexp='/usr/lib/perl/5.7.3/epoc'
+archlib='?:/perl/lib/5.7.3/epoc'
+archlibexp='?:/perl/lib/5.7.3/epoc'
 archname64=''
 archname='epoc'
 archobjs='epoc.o epocish.o epoc_stubs.o'
@@ -715,8 +715,8 @@ pmake=''
 pr=''
 prefix=''
 prefixexp=''
-privlib='/usr/lib/perl/5.7.3'
-privlibexp='/usr/lib/perl/5.7.3'
+privlib='?:/perl/lib/5.7.3'
+privlibexp='?:/perl/lib/5.7.3'
 procselfexe=''
 prototype='define'
 ptrsize='4'
@@ -771,11 +771,11 @@ sig_num='0'
 sig_num_init='0, 0'
 sig_size='1'
 signal_t='void'
-sitearch='/usr/lib/perl/site_perl/5.7.3/epoc'
-sitearchexp='/usr/lib/perl/site_perl/5.7.3/epoc'
-sitelib='/usr/lib/perl/site_perl/5.7.3/'
-sitelib_stem='/usr/lib/perl/site_perl'
-sitelibexp='/usr/lib/perl/site_perl/5.7.3/'
+sitearch='?:/perl/lib/site_perl/5.7.3/epoc'
+sitearchexp='?:/perl/lib/site_perl/5.7.3/epoc'
+sitelib='?:/perl/lib/site_perl/5.7.3/'
+sitelib_stem='?:/perl/lib/site_perl'
+sitelibexp='?:/perl/lib/site_perl/5.7.3/'
 siteprefix=''
 siteprefixexp=''
 sizesize='4'
diff --git a/pp_sys.c b/pp_sys.c
index f250428745..941760bd73 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -2291,7 +2291,7 @@ PP(pp_socket)
 
 PP(pp_sockpair)
 {
-#if defined (HAS_SOCKETPAIR) || (defined (HAS_SOCKET) && defined(SOCK_DGRAM) && defined(AF_INET) && defined(PF_INET) && defined(HAS_SELECT))
+#if defined (HAS_SOCKETPAIR) || (defined (HAS_SOCKET) && defined(SOCK_DGRAM) && defined(AF_INET) && defined(PF_INET))
     dSP;
     GV *gv1;
     GV *gv2;
diff --git a/util.c b/util.c
index cd13986a6b..d95f1e00e1 100644
--- a/util.c
+++ b/util.c
@@ -4055,7 +4055,7 @@ Perl_new_vstring(pTHX_ char *s, SV *sv)
     return s;
 }
 
-#if !defined(HAS_SOCKETPAIR) && defined(HAS_SOCKET) && defined(AF_INET) && defined(PF_INET) && defined(SOCK_DGRAM)
+#if !defined(HAS_SOCKETPAIR) && defined(HAS_SOCKET) && defined(AF_INET) && defined(PF_INET) && defined(SOCK_DGRAM) && defined(HAS_SELECT)
 #   define EMULATE_SOCKETPAIR_UDP
 #endif