Rename process.[hc] to coder.[hc] and io.[hc] to file_io.[hc]

to avoid problems on systems with system headers with those
names.

diff --git a/dos/Makefile b/dos/Makefile
index 9d5631269e48600482057738cc6e81ddcdc884ca..0b8a088c183cc780c66b534f7dc2b742d0d99157 100644 (file)
--- a/dos/Makefile
+++ b/dos/Makefile
@@ -223,12 +223,12 @@ xzdec-clean:
 
 XZ_SRCS = \
        ../src/xz/args.c \
+       ../src/xz/coder.c \
+       ../src/xz/file_io.c \
        ../src/xz/hardware.c \
-       ../src/xz/io.c \
        ../src/xz/main.c \
        ../src/xz/message.c \
        ../src/xz/options.c \
-       ../src/xz/process.c \
        ../src/xz/signals.c \
        ../src/xz/suffix.c \
        ../src/xz/util.c

diff --git a/src/xz/Makefile.am b/src/xz/Makefile.am
index ff88a839771d599e32d326f1a37907aab98866ed..121a2d1c26ef336d62b3b767673cebc7e2f7729c 100644 (file)
--- a/src/xz/Makefile.am
+++ b/src/xz/Makefile.am
@@ -10,10 +10,12 @@ bin_PROGRAMS = xz
 xz_SOURCES = \
        args.c \
        args.h \
+       coder.c \
+       coder.h \
+       file_io.c \
+       file_io.h \
        hardware.c \
        hardware.h \
-       io.c \
-       io.h \
        main.c \
        main.h \
        message.c \
@@ -21,8 +23,6 @@ xz_SOURCES = \
        options.c \
        options.h \
        private.h \
-       process.c \
-       process.h \
        signals.c \
        signals.h \
        suffix.c \

diff --git a/src/xz/process.c b/src/xz/coder.c
similarity index 100%
rename from src/xz/process.c
rename to src/xz/coder.c

diff --git a/src/xz/process.h b/src/xz/coder.h
similarity index 100%
rename from src/xz/process.h
rename to src/xz/coder.h

diff --git a/src/xz/io.c b/src/xz/file_io.c
similarity index 100%
rename from src/xz/io.c
rename to src/xz/file_io.c

diff --git a/src/xz/io.h b/src/xz/file_io.h
similarity index 100%
rename from src/xz/io.h
rename to src/xz/file_io.h

diff --git a/src/xz/private.h b/src/xz/private.h
index 1ed37cd00a6afd10a5c7b3024bcc0a1fc7f60174..6141b88c416f771b0a26520827f6bf21b5e9f4ef 100644 (file)
--- a/src/xz/private.h
+++ b/src/xz/private.h
@@ -44,11 +44,11 @@
 #endif
 
 #include "main.h"
-#include "process.h"
+#include "coder.h"
 #include "message.h"
 #include "args.h"
 #include "hardware.h"
-#include "io.h"
+#include "file_io.h"
 #include "options.h"
 #include "signals.h"
 #include "suffix.h"

diff --git a/windows/Makefile b/windows/Makefile
index 192348bd29c5adfe8d7736d3bcf84dde63d6dda4..0ff45a814d64b4a2a672d7c4a8da31e35de15674 100644 (file)
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -273,12 +273,12 @@ xz: xz-dynamic.exe xz.exe
 
 XZ_SRCS = \
        ../src/xz/args.c \
+       ../src/xz/coder.c \
+       ../src/xz/file_io.c \
        ../src/xz/hardware.c \
-       ../src/xz/io.c \
        ../src/xz/main.c \
        ../src/xz/message.c \
        ../src/xz/options.c \
-       ../src/xz/process.c \
        ../src/xz/signals.c \
        ../src/xz/suffix.c \
        ../src/xz/util.c