fixed multiple imports problem

libasn1parser/asn1p_y.h

@@ -23,8 +23,8 @@
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 
-#ifndef BISON_Y_TAB_H
-# define BISON_Y_TAB_H
+#ifndef BISON_ASN_P_Y_H
+# define BISON_ASN_P_Y_H
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -274,5 +274,5 @@ typedef union {
 extern YYSTYPE asn1p_lval;
 
 
-#endif /* not BISON_Y_TAB_H */
+#endif /* not BISON_ASN_P_Y_H */
 

libasn1parser/asn1p_y.y

@@ -456,12 +456,13 @@ ModuleSpecificationBody:
 #error	MY_IMPORT DEFINED ELSEWHERE!
 #endif
 #define	MY_IMPORT(foo,field)	do {				\
-		if(TQ_FIRST(&($2->foo))) {			\
+		while(TQ_FIRST(&($2->foo))) {			\
 			TQ_ADD(&($$->foo),			\
 				TQ_REMOVE(&($2->foo), field),	\
 				field);				\
-			assert(TQ_FIRST(&($2->foo)) == 0);	\
-		} } while(0)
+		}						\
+		assert(TQ_FIRST(&($2->foo)) == 0);		\
+	} while(0)
 
 		MY_IMPORT(imports, xp_next);
 		MY_IMPORT(exports, xp_next);