diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2009-06-26 20:49:54 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2009-06-26 20:49:54 +0300 |
| commit | 65014fd211dfbd4be48685998cb5a12aaa29c8d2 (patch) | |
| tree | 886df71738ce7d62bdc8bf229fb63b01bcce3f0c | |
| parent | Rename process_file() to coder_run(). (diff) | |
| download | xz-65014fd211dfbd4be48685998cb5a12aaa29c8d2.tar.xz | |
Rename process.[hc] to coder.[hc] and io.[hc] to file_io.[hc]
to avoid problems on systems with system headers with those
names.
| -rw-r--r-- | dos/Makefile | 4 | ||||
| -rw-r--r-- | src/xz/Makefile.am | 8 | ||||
| -rw-r--r-- | src/xz/coder.c (renamed from src/xz/process.c) | 0 | ||||
| -rw-r--r-- | src/xz/coder.h (renamed from src/xz/process.h) | 0 | ||||
| -rw-r--r-- | src/xz/file_io.c (renamed from src/xz/io.c) | 0 | ||||
| -rw-r--r-- | src/xz/file_io.h (renamed from src/xz/io.h) | 0 | ||||
| -rw-r--r-- | src/xz/private.h | 4 | ||||
| -rw-r--r-- | windows/Makefile | 4 |
8 files changed, 10 insertions, 10 deletions
diff --git a/dos/Makefile b/dos/Makefile index 9d563126..0b8a088c 100644 --- 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 ff88a839..121a2d1c 100644 --- 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 index 1c904343..1c904343 100644 --- a/src/xz/process.c +++ b/src/xz/coder.c diff --git a/src/xz/process.h b/src/xz/coder.h index aa8a4d83..aa8a4d83 100644 --- a/src/xz/process.h +++ b/src/xz/coder.h diff --git a/src/xz/io.c b/src/xz/file_io.c index d8eb5f06..d8eb5f06 100644 --- a/src/xz/io.c +++ b/src/xz/file_io.c diff --git a/src/xz/io.h b/src/xz/file_io.h index c10554ad..c10554ad 100644 --- a/src/xz/io.h +++ b/src/xz/file_io.h diff --git a/src/xz/private.h b/src/xz/private.h index 1ed37cd0..6141b88c 100644 --- 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 192348bd..0ff45a81 100644 --- 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 |