Rename cmd/lefty/io.h to cmd/lefty/leftyio.h

to avoid conflicts with Windows io.h

diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am
index 469e0c339ce2c26ac74ad19acff1f9d8d63992a0..a98d96487c5cebe6f448bd09e54d765952f3435d 100644 (file)
--- 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 496d86cc1d439bb87eeab36250befea064e01c79..80197f4a3412f15a88d905fcfd5af9b060debe1c 100644 (file)
--- 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 49c1a6609ee07c1ffeb3b0d5c01122aab932dfa2..cf738c0c7e8292d1fee428ff2e92c251f69b76ba 100644 (file)
--- 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 2042072a45601fc7ad80c51fca9f92eb044b149b..f2f2a84fc22d0aacd48fc5f710f274c029f92779 100644 (file)
--- 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 abf4f4cd8b158b2c7ac1ede4f4636bf0423d6f70..7703174783bfda0e44b47250b3ce2cc334e5b4ff 100644 (file)
--- 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 9560010185459db146023d17557fdc0a6472999d..f27f797d5e9784c216035a4f6fb8d6b2b10dc3d5 100644 (file)
--- 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 4808edd527324ef16c71a843f85468ce33ba8e21..82b86290bd261ba8f4518e2ef3fc6cb03cafdd6f 100644 (file)
--- 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 bb6123fa3908e1fd5aeec5cc9429f6eba6de35f0..af16a450b1c4ab2a346617bb48d07706d5fedd88 100644 (file)
--- a/cmd/lefty/os/mswin32/lefty.mak
+++ b/cmd/lefty/os/mswin32/lefty.mak
@@ -429,7 +429,7 @@ DEP_CPP_LEFTY=\
        ".\g.h"\\r
        ".\gfxview.h"\\r
        ".\internal.h"\\r
-       ".\io.h"\\r
+       ".\leftyio.h"\\r
        ".\mem.h"\\r
        ".\parse.h"\\r
        ".\str.h"\\r
@@ -460,7 +460,7 @@ DEP_CPP_INTER=\
        ".\g.h"\\r
        ".\gfxview.h"\\r
        ".\internal.h"\\r
-       ".\io.h"\\r
+       ".\leftyio.h"\\r
        ".\mem.h"\\r
        ".\parse.h"\\r
        ".\tbl.h"\\r
@@ -487,7 +487,7 @@ DEP_CPP_GFXVI=\
        ".\exec.h"\\r
        ".\g.h"\\r
        ".\gfxview.h"\\r
-       ".\io.h"\\r
+       ".\leftyio.h"\\r
        ".\mem.h"\\r
        ".\parse.h"\\r
        ".\tbl.h"\\r
@@ -614,7 +614,7 @@ DEP_CPP_DOTLE=\
        ".\dot2l\triefa.c"\\r
        ".\dot2l\triefa.h"\\r
        ".\dotparse.h"\\r
-       ".\io.h"\\r
+       ".\leftyio.h"\\r
        {$(INCLUDE)}"\sys\STAT.H"\\r
        {$(INCLUDE)}"\sys\TYPES.H"\\r
        \r
@@ -632,7 +632,7 @@ DEP_CPP_DOT2L=\
        ".\./dot2l\dot2l.h"\\r
        ".\code.h"\\r
        ".\common.h"\\r
-       ".\io.h"\\r
+       ".\leftyio.h"\\r
        ".\mem.h"\\r
        ".\tbl.h"\\r
        {$(INCLUDE)}"\sys\STAT.H"\\r
@@ -651,7 +651,7 @@ SOURCE=.\os\mswin32\io.c
 DEP_CPP_IO_C22=\\r
        ".\common.h"\\r
        ".\g.h"\\r
-       ".\io.h"\\r
+       ".\leftyio.h"\\r
        ".\mem.h"\\r
        {$(INCLUDE)}"\sys\STAT.H"\\r
        {$(INCLUDE)}"\sys\TYPES.H"\\r

diff --git a/cmd/lefty/os/unix/io.c b/cmd/lefty/os/unix/io.c
index ddadc8478f539df88e18f73548cfbd52ba312046..dba142959f773e2e964be99084be25b6dd9b851c 100644 (file)
--- 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