Removed src/liblzma/common/sysdefs.h symlink, which was

annoying, because "make dist" put two copies of sysdefs.h
into the tarball instead of the symlink.

diff --git a/src/liblzma/check/crc32_table.c b/src/liblzma/check/crc32_table.c
index f1cc0dafc971947830fb63ccdb5d42fc958c42e2..4fcebc2bc097368c0181c9ef6ff7df8c5fbe6eb4 100644 (file)
--- a/src/liblzma/check/crc32_table.c
+++ b/src/liblzma/check/crc32_table.c
@@ -11,7 +11,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "sysdefs.h"
+#include "common.h"
 
 #ifdef WORDS_BIGENDIAN
 #      include "crc32_table_be.h"

diff --git a/src/liblzma/check/crc64_table.c b/src/liblzma/check/crc64_table.c
index 2f2273190e2a60ec37f7a1a5a55c2c0b5d8da548..983ed31ff2fa6521f616ee5859cfc70e113f8b68 100644 (file)
--- a/src/liblzma/check/crc64_table.c
+++ b/src/liblzma/check/crc64_table.c
@@ -11,7 +11,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "sysdefs.h"
+#include "common.h"
 
 #ifdef WORDS_BIGENDIAN
 #      include "crc64_table_be.h"

diff --git a/src/liblzma/common/Makefile.am b/src/liblzma/common/Makefile.am
index dad80ecd8c43f1b2ce99051ea3d6e35721c7f4a1..c650a34cbd80e4a3106146fbea00621c09856b75 100644 (file)
--- a/src/liblzma/common/Makefile.am
+++ b/src/liblzma/common/Makefile.am
@@ -23,7 +23,6 @@ libcommon_la_CPPFLAGS = \
        -I@top_srcdir@/src/liblzma/rangecoder
 libcommon_la_SOURCES = \
        common.h \
-       sysdefs.h \
        bsr.h \
        allocator.c \
        block_private.h \

diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h
index ca9c2f237d7aaf4ec7fbd34508f83c254aacd1b5..5dd7a87f43062239dee2523625996213c67952b3 100644 (file)
--- a/src/liblzma/common/common.h
+++ b/src/liblzma/common/common.h
@@ -20,7 +20,7 @@
 #ifndef LZMA_COMMON_H
 #define LZMA_COMMON_H
 
-#include "sysdefs.h"
+#include "../../common/sysdefs.h"
 
 // Don't use ifdef...
 #if HAVE_VISIBILITY

diff --git a/src/liblzma/common/sysdefs.h b/src/liblzma/common/sysdefs.h
deleted file mode 120000 (symlink)
index c6cb676..0000000
--- a/src/liblzma/common/sysdefs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../common/sysdefs.h
\ No newline at end of file