check for USE_ITHREADS sanity was too restrictive

p4raw-id: //depot/perl@4790

diff --git a/perl.h b/perl.h
index ecc1ce1..f77b823 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -43,10 +43,6 @@
 #  endif
 #endif
 
-#if defined(USE_ITHREADS) && !defined(MULTIPLICITY)
-#  include "error: USE_ITHREADS must be built with MULTIPLICITY"
-#endif
-
 #if defined(MULTIPLICITY)
 #  ifndef PERL_IMPLICIT_CONTEXT
 #    define PERL_IMPLICIT_CONTEXT
@@ -55,6 +51,9 @@
 
 #ifdef PERL_CAPI
 #  undef PERL_OBJECT
+#  ifndef MULTIPLICITY
+#    define MULTIPLICITY
+#  endif
 #  ifndef PERL_IMPLICIT_CONTEXT
 #    define PERL_IMPLICIT_CONTEXT
 #  endif
@@ -72,6 +71,10 @@
 #  endif
 #endif
 
+#if defined(USE_ITHREADS) && !defined(MULTIPLICITY) && !defined(PERL_OBJECT)
+#  include "error: USE_ITHREADS must be built with MULTIPLICITY"
+#endif
+
 #ifdef PERL_OBJECT
 
 /* PERL_OBJECT explained  - DickH and DougL @ ActiveState.com