Re-order the tests to match the comment

[perl5.git] / NetWare / nwperlsys.c

diff --git a/NetWare/nwperlsys.c b/NetWare/nwperlsys.c
index b1bf8dd..9eca522 100644 (file)
--- a/NetWare/nwperlsys.c
+++ b/NetWare/nwperlsys.c
@@ -20,10 +20,6 @@
 #include "perl.h"
 
 
-#ifdef PERL_OBJECT
-#define NO_XSLOCKS
-#endif
-
 //CHKSGP
 //Including this is giving premature end-of-file error during compilation
 //#include "XSUB.h"
@@ -91,9 +87,8 @@ perl_alloc(void)
        WCValHashTable<void*>*  m_allocList;
        m_allocList = new WCValHashTable<void*> (fnAllocListHash, 256);
        fnInsertHashListAddrs(m_allocList, FALSE);
-
        my_perl = perl_alloc_using(&perlMem,
-                                  NULL,
+                                  &perlMem,
                                   NULL,
                                   &perlEnv,
                                   &perlStdIO,
@@ -102,9 +97,6 @@ perl_alloc(void)
                                   &perlSock,
                                   &perlProc);
        if (my_perl) {
-#ifdef PERL_OBJECT
-           CPerlObj* pPerl = (CPerlObj*)my_perl;
-#endif
                //nw5_internal_host = m_allocList;
        }
     return my_perl;
@@ -176,9 +168,8 @@ perl_alloc_override(struct IPerlMem** ppMem, struct IPerlMem** ppMemShared,
                lpProc=&perlProc;
        else
                lpProc=*ppProc;
-
        my_perl = perl_alloc_using(lpMem,
-                                  NULL,
+                                  lpMem,
                                   NULL,
                                   lpEnv,
                                   lpStdio,
@@ -188,9 +179,6 @@ perl_alloc_override(struct IPerlMem** ppMem, struct IPerlMem** ppMemShared,
                                   lpProc);
        
        if (my_perl) {
-#ifdef PERL_OBJECT
-           CPerlObj* pPerl = (CPerlObj*)my_perl;
-#endif
            //nw5_internal_host = pHost;
        }
     return my_perl;