[PATCH:libXaw3d 1/2] Add LayYY.h header for common definitions of lex/yacc created functions

[Alan Coopersmith]

Ensures all sources use consistent types and provides central place
to add _X_HIDDEN tags to avoid exporting these as part of the API/ABI.

Also fixes:
"laygram.c", line 1363: warning: implicit function declaration: LayYYlex
"laygram.c", line 1777: warning: implicit function declaration: LayYYerror

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 src/LayYY.h     |   10 ++++++++++
 src/Layout.c    |    6 ++----
 src/Makefile.am |    1 +
 src/laygram.y   |    2 ++
 src/laylex.l    |    1 +
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 src/LayYY.h

diff --git a/src/LayYY.h b/src/LayYY.h
new file mode 100644
index 0000000..7d0c1cd
--- /dev/null
+++ b/src/LayYY.h
@@ -0,0 +1,10 @@
+#include <X11/Xfuncproto.h>
+
+/* Functions autogenerated from laygram.y into laygram.c */
+extern _X_HIDDEN void LayYYsetsource (char *);
+extern _X_HIDDEN void LayYYsetdest (LayoutPtr *);
+extern _X_HIDDEN int  LayYYparse (void);
+
+/* Functions autogenerated from laylex.l into laylex.c */
+extern _X_HIDDEN int  LayYYlex (void);
+extern _X_HIDDEN void LayYYerror (char *s);
diff --git a/src/Layout.c b/src/Layout.c
index c98bd39..62082a5 100644
--- a/src/Layout.c
+++ b/src/Layout.c
@@ -43,6 +43,8 @@
 #include <ctype.h>
 #include <stdio.h>
 
+#include "LayYY.h"
+
 #undef DEBUG
 #ifdef DEBUG
 static char *DBUG_currentproc, *DBUG_lastproc;
@@ -101,10 +103,6 @@ static void LayoutLayout (LayoutWidget, Bool);
 static void LayoutGetNaturalSize (LayoutWidget, Dimension *, Dimension *);
 static void LayoutFreeLayout (BoxPtr);
 
-extern void LayYYsetsource(char *);
-extern void LayYYsetdest(LayoutPtr *);
-extern int LayYYparse(void);
-
 #ifdef MOTIF
 #define SuperClass ((ConstraintWidgetClass)&xmManagerClassRec)
 #else
diff --git a/src/Makefile.am b/src/Makefile.am
index 29e3107..ccbfb87 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,6 +35,7 @@ libXaw3d_la_SOURCES = \
 	Grip.c \
 	Label.c \
 	Layout.c \
+	LayYY.h \
 	List.c \
 	MenuButton.c \
 	Paned.c \
diff --git a/src/laygram.y b/src/laygram.y
index 6c79b16..5ac2e0a 100644
--- a/src/laygram.y
+++ b/src/laygram.y
@@ -11,6 +11,8 @@
 #include    <X11/Xmu/Converters.h>
 #include    <X11/Xaw3d/LayoutP.h>
 
+#include    "LayYY.h"
+
 #define yysetdest LayYYsetdest
 #define yywrap LayYYwrap
 
diff --git a/src/laylex.l b/src/laylex.l
index e357207..2574782 100644
--- a/src/laylex.l
+++ b/src/laylex.l
@@ -13,6 +13,7 @@
 
 #include    <X11/Xaw3d/LayoutP.h>
 #include    "laygram.h"
+#include    "LayYY.h"
 
 #define yylval LayYYlval
 #define yyerror LayYYerror
-- 
1.7.3.2