From 07bf6125144ef1a8fbd2d1032a9f3064d0f16e8c Mon Sep 17 00:00:00 2001
From: Tony Kelman <tony@kelman.net>
Date: Tue, 7 Apr 2015 22:30:27 -0700
Subject: [PATCH] Rename cmd/lefty/io.h to cmd/lefty/leftyio.h

to avoid conflicts with Windows io.h
---
 cmd/lefty/Makefile.am          |  2 +-
 cmd/lefty/dot2l/dot2l.c        |  2 +-
 cmd/lefty/dot2l/dotlex.c       |  2 +-
 cmd/lefty/gfxview.c            |  2 +-
 cmd/lefty/internal.c           |  2 +-
 cmd/lefty/lefty.c              |  2 +-
 cmd/lefty/{io.h => leftyio.h}  |  0
 cmd/lefty/os/mswin32/io.c      |  2 +-
 cmd/lefty/os/mswin32/lefty.mak | 12 ++++++------
 cmd/lefty/os/unix/io.c         |  2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)
 rename cmd/lefty/{io.h => leftyio.h} (100%)

diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am
index 469e0c339..a98d96487 100644
--- a/cmd/lefty/Makefile.am
+++ b/cmd/lefty/Makefile.am
@@ -46,7 +46,7 @@ man = lefty.1
 pdf = lefty.1.pdf
 
 noinst_HEADERS = code.h common.h display.h exec.h g.h gfxview.h internal.h \
-	io.h lex.h mem.h parse.h str.h tbl.h txtview.h
+	leftyio.h lex.h mem.h parse.h str.h tbl.h txtview.h
 
 if WITH_X
 if WITH_XAW
diff --git a/cmd/lefty/dot2l/dot2l.c b/cmd/lefty/dot2l/dot2l.c
index 496d86cc1..80197f4a3 100644
--- a/cmd/lefty/dot2l/dot2l.c
+++ b/cmd/lefty/dot2l/dot2l.c
@@ -13,7 +13,7 @@
 
 #include "common.h"
 #include "mem.h"
-#include "io.h"
+#include "leftyio.h"
 #include "code.h"
 #include "tbl.h"
 #include "dot2l.h"
diff --git a/cmd/lefty/dot2l/dotlex.c b/cmd/lefty/dot2l/dotlex.c
index 49c1a6609..cf738c0c7 100644
--- a/cmd/lefty/dot2l/dotlex.c
+++ b/cmd/lefty/dot2l/dotlex.c
@@ -17,7 +17,7 @@ typedef void *Tobj;
 #include "common.h"
 #include "dotparse.h"
 #include "dot2l.h"
-#include "io.h"
+#include "leftyio.h"
 #include "triefa.c"
 
 static int syntax_errors;
diff --git a/cmd/lefty/gfxview.c b/cmd/lefty/gfxview.c
index 2042072a4..f2f2a84fc 100644
--- a/cmd/lefty/gfxview.c
+++ b/cmd/lefty/gfxview.c
@@ -16,7 +16,7 @@
 #include "common.h"
 #include "g.h"
 #include "mem.h"
-#include "io.h"
+#include "leftyio.h"
 #include "code.h"
 #include "tbl.h"
 #include "parse.h"
diff --git a/cmd/lefty/internal.c b/cmd/lefty/internal.c
index abf4f4cd8..770317478 100644
--- a/cmd/lefty/internal.c
+++ b/cmd/lefty/internal.c
@@ -16,7 +16,7 @@
 #include "common.h"
 #include "g.h"
 #include "mem.h"
-#include "io.h"
+#include "leftyio.h"
 #include "code.h"
 #include "tbl.h"
 #include "parse.h"
diff --git a/cmd/lefty/lefty.c b/cmd/lefty/lefty.c
index 956001018..f27f797d5 100644
--- a/cmd/lefty/lefty.c
+++ b/cmd/lefty/lefty.c
@@ -23,7 +23,7 @@
 #include "common.h"
 #include "g.h"
 #include "code.h"
-#include "io.h"
+#include "leftyio.h"
 #include "mem.h"
 #include "tbl.h"
 #include "parse.h"
diff --git a/cmd/lefty/io.h b/cmd/lefty/leftyio.h
similarity index 100%
rename from cmd/lefty/io.h
rename to cmd/lefty/leftyio.h
diff --git a/cmd/lefty/os/mswin32/io.c b/cmd/lefty/os/mswin32/io.c
index 4808edd52..82b86290b 100644
--- a/cmd/lefty/os/mswin32/io.c
+++ b/cmd/lefty/os/mswin32/io.c
@@ -15,7 +15,7 @@
 
 #include "common.h"
 #include "g.h"
-#include "io.h"
+#include "leftyio.h"
 #include "mem.h"
 
 io_t *iop;
diff --git a/cmd/lefty/os/mswin32/lefty.mak b/cmd/lefty/os/mswin32/lefty.mak
index bb6123fa3..af16a450b 100644
--- a/cmd/lefty/os/mswin32/lefty.mak
+++ b/cmd/lefty/os/mswin32/lefty.mak
@@ -429,7 +429,7 @@ DEP_CPP_LEFTY=\
 	".\g.h"\
 	".\gfxview.h"\
 	".\internal.h"\
-	".\io.h"\
+	".\leftyio.h"\
 	".\mem.h"\
 	".\parse.h"\
 	".\str.h"\
@@ -460,7 +460,7 @@ DEP_CPP_INTER=\
 	".\g.h"\
 	".\gfxview.h"\
 	".\internal.h"\
-	".\io.h"\
+	".\leftyio.h"\
 	".\mem.h"\
 	".\parse.h"\
 	".\tbl.h"\
@@ -487,7 +487,7 @@ DEP_CPP_GFXVI=\
 	".\exec.h"\
 	".\g.h"\
 	".\gfxview.h"\
-	".\io.h"\
+	".\leftyio.h"\
 	".\mem.h"\
 	".\parse.h"\
 	".\tbl.h"\
@@ -614,7 +614,7 @@ DEP_CPP_DOTLE=\
 	".\dot2l\triefa.c"\
 	".\dot2l\triefa.h"\
 	".\dotparse.h"\
-	".\io.h"\
+	".\leftyio.h"\
 	{$(INCLUDE)}"\sys\STAT.H"\
 	{$(INCLUDE)}"\sys\TYPES.H"\
 	
@@ -632,7 +632,7 @@ DEP_CPP_DOT2L=\
 	".\./dot2l\dot2l.h"\
 	".\code.h"\
 	".\common.h"\
-	".\io.h"\
+	".\leftyio.h"\
 	".\mem.h"\
 	".\tbl.h"\
 	{$(INCLUDE)}"\sys\STAT.H"\
@@ -651,7 +651,7 @@ SOURCE=.\os\mswin32\io.c
 DEP_CPP_IO_C22=\
 	".\common.h"\
 	".\g.h"\
-	".\io.h"\
+	".\leftyio.h"\
 	".\mem.h"\
 	{$(INCLUDE)}"\sys\STAT.H"\
 	{$(INCLUDE)}"\sys\TYPES.H"\
diff --git a/cmd/lefty/os/unix/io.c b/cmd/lefty/os/unix/io.c
index ddadc8478..dba142959 100644
--- a/cmd/lefty/os/unix/io.c
+++ b/cmd/lefty/os/unix/io.c
@@ -14,7 +14,7 @@
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 #include "common.h"
-#include "io.h"
+#include "leftyio.h"
 #ifdef FEATURE_CS
 #include "cs2l.h"
 #endif
-- 
2.50.1