Revert "Add [Polymorphic] flag for defs"

This reverts commit 33434695615806a85cec88452c93ea69ffc0e719.

Conflicts:

	kernel/term_typing.ml
	test-suite/success/polymorphism.v

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13998 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 4 insertions, 5 deletions

diff --git a/kernel/term_typing.ml b/kernel/term_typing.ml
index 97d2fe521..6b44bcad3 100644
--- a/kernel/term_typing.ml
+++ b/kernel/term_typing.ml
@@ -26,8 +26,9 @@ open Type_errors
 open Indtypes
 open Typeops
 
-let constrain_type env j cst1 poly = function
-  | None -> make_polymorphic env j, cst1
+let constrain_type env j cst1 = function
+  | None ->
+      make_polymorphic_if_constant_for_ind env j, cst1
   | Some t ->
       let (tj,cst2) = infer_type env t in
       let (_,cst3) = judge_of_cast env j DEFAULTcast tj in
@@ -92,9 +93,7 @@ let infer_declaration env dcl =
   match dcl with
   | DefinitionEntry c ->
       let (j,cst) = infer env c.const_entry_body in
-      let (typ,cst) = constrain_type env j cst 
-	c.const_entry_polymorphic c.const_entry_type 
-      in
+      let (typ,cst) = constrain_type env j cst c.const_entry_type in
       let def =
 	if c.const_entry_opaque
 	then OpaqueDef (Declarations.opaque_from_val j.uj_val)