fix: some preprocessor commands

Singular · Apr 4, 2012 · 7cb5590 · 7cb5590
1 parent ae3775b
commit 7cb5590
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/factory/cf_factor.cc b/factory/cf_factor.cc
@@ -440,7 +440,8 @@ CFFList factorize ( const CanonicalForm & f, bool issqrfree )
       mp_limb_t leadingCoeff= nmod_poly_factor (result, f1);
       F= convertFLINTnmod_poly_factor2FacCFFList (result, leadingCoeff, f.mvar());
       nmod_poly_factor_clear (result);
-#else ifdef HAVE_NTL
+#else
+#ifdef HAVE_NTL
       if (isOn(SW_USE_NTL) && (isPurePoly(f)))
       {
         // USE NTL
@@ -539,7 +540,8 @@ CFFList factorize ( const CanonicalForm & f, bool issqrfree )
         }
       }
       else
-      #endif
+#endif //HAVE_NTL
+#endif //HAVE_FLINT
       {  // Use Factory without NTL
         if ( isOn( SW_BERLEKAMP ) )
           F=FpFactorizeUnivariateB( f, issqrfree );

diff --git a/factory/cf_gcd.cc b/factory/cf_gcd.cc
@@ -553,9 +553,11 @@ gcd_poly_p( const CanonicalForm & f, const CanonicalForm & g )
 #ifdef HAVE_FLINT
         if (bpure && (CFFactory::gettype() != GaloisFieldDomain))
           return gcd_univar_flintp(pi,pi1)*C;
-#else ifdef HAVE_NTL
+#else
+#ifdef HAVE_NTL
         if ( isOn(SW_USE_NTL_GCD_P) && bpure && (CFFactory::gettype() != GaloisFieldDomain))
             return gcd_univar_ntlp(pi, pi1 ) * C;
+#endif
 #endif
     }
     Variable v = f.mvar();
@@ -629,9 +631,11 @@ gcd_poly_0( const CanonicalForm & f, const CanonicalForm & g )
 #ifdef HAVE_FLINT
         if (isPurePoly(pi) && isPurePoly(pi1) )
             return gcd_univar_flint0(pi, pi1 ) * C;
-#else ifdef HAVE_NTL
+#else
+#ifdef HAVE_NTL
         if ( isOn(SW_USE_NTL_GCD_0) && isPurePoly(pi) && isPurePoly(pi1) )
             return gcd_univar_ntl0(pi, pi1 ) * C;
+#endif
 #endif
         return gcd_poly_univar0( pi, pi1, true ) * C;
     }