another attempt to port the robust parser to MacOS

4 files changed, 4 insertions, 6 deletions

diff --git a/src/runtime/c/pgf/data.h b/src/runtime/c/pgf/data.h
index cdbbf8d6b..63c26d318 100644
--- a/src/runtime/c/pgf/data.h
+++ b/src/runtime/c/pgf/data.h
@@ -297,11 +297,11 @@ struct PgfPArg {
 	PgfCCatIds* hypos;
 };
 
-GU_DECLARE_TYPE(PgfPArg, struct);
+extern GU_DECLARE_TYPE(PgfPArg, struct);
 
 typedef GuSeq PgfPArgs;
 
-GU_DECLARE_TYPE(PgfPArgs, GuSeq);
+extern GU_DECLARE_TYPE(PgfPArgs, GuSeq);
 
 typedef struct {
 	PgfFunId fun; 
diff --git a/src/runtime/c/pgf/expr.h b/src/runtime/c/pgf/expr.h
index 003102792..f4d5881c7 100644
--- a/src/runtime/c/pgf/expr.h
+++ b/src/runtime/c/pgf/expr.h
@@ -13,7 +13,7 @@
 /// An abstract syntax tree
 typedef GuVariant PgfExpr;
 
-GU_DECLARE_TYPE(PgfExpr, GuVariant);
+extern GU_DECLARE_TYPE(PgfExpr, GuVariant);
 
 typedef GuList(PgfExpr) PgfExprs;
 
diff --git a/src/runtime/c/pgf/parser.c b/src/runtime/c/pgf/parser.c
index 4cb1c1b4d..864674833 100644
--- a/src/runtime/c/pgf/parser.c
+++ b/src/runtime/c/pgf/parser.c
@@ -110,13 +110,11 @@ static GU_DEFINE_TYPE(PgfCFCat, struct,
 
 extern GuHasher pgf_cfcat_hasher;
 
-typedef GuMap PgfEpsilonIdx;
 GU_DEFINE_TYPE(PgfEpsilonIdx, GuMap,
 		      gu_type(PgfCFCat), &pgf_cfcat_hasher,
 		      gu_ptr_type(PgfCCat), &gu_null_struct);
 
 // GuString -> PgfItemBuf*
-typedef GuStringMap PgfTransitions;
 GU_DEFINE_TYPE(PgfTransitions, GuStringMap,
 		      gu_ptr_type(PgfItemBuf), &gu_null_struct);
 
diff --git a/src/runtime/c/pgf/pgf.h b/src/runtime/c/pgf/pgf.h
index df4904b53..91659d95e 100644
--- a/src/runtime/c/pgf/pgf.h
+++ b/src/runtime/c/pgf/pgf.h
@@ -70,7 +70,7 @@ pgf_read(GuIn* in, GuPool* pool, GuExn* err);
 
 
 #include <gu/type.h>
-GU_DECLARE_TYPE(PgfPGF, struct);
+extern GU_DECLARE_TYPE(PgfPGF, struct);
 
 /// @}