summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2011-05-10 16:44:38 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2011-05-10 16:44:38 +0000
commitd770d2554b4dc7b2373e9d512f148c28e5300c64 (patch)
treea5ed989c68da184a706fdc6368636e8bbe980304
parentde06c833349b01833403a4cd0c0072c51cc13771 (diff)
downloadzsh-d770d2554b4dc7b2373e9d512f148c28e5300c64.tar.gz
zsh-d770d2554b4dc7b2373e9d512f148c28e5300c64.tar.xz
zsh-d770d2554b4dc7b2373e9d512f148c28e5300c64.zip
rename system.h to zsh_system.h
-rw-r--r--ChangeLog6
-rw-r--r--Src/.distfiles2
-rw-r--r--Src/zsh.mdd2
-rw-r--r--Src/zsh_system.h (renamed from Src/system.h)0
4 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ea25e5c29..53d45c857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-10  Peter Stephenson  <pws@csr.com>
 
+	* unposted: Src/.distfiles, Src/system.h, Src/zsh.mdd,
+	Src/zsh_system.h: rename system.h to zsh_system.h to ensure
+	there are no clashes.
+
 	* 29214: Src/Makemod.in.in, Src/mkmakemod.sh, Src/zsh.mdd: use
 	-I to find headers in order to allow #include'ing generated
 	headers from non-generated headers when the build tree is
@@ -14642,5 +14646,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5288 $
+* $Revision: 1.5289 $
 *****************************************************
diff --git a/Src/.distfiles b/Src/.distfiles
index 9c1859080..1da58ea17 100644
--- a/Src/.distfiles
+++ b/Src/.distfiles
@@ -41,12 +41,12 @@ signals.h
 sort.c
 string.c
 subst.c
-system.h
 text.c
 utils.c
 watch.c
 zsh.h
 zsh.mdd
+zsh_system.h
 ztype.h
 zsh.rc
 zsh.ico
diff --git a/Src/zsh.mdd b/Src/zsh.mdd
index 520c3acc9..a1c0edcfd 100644
--- a/Src/zsh.mdd
+++ b/Src/zsh.mdd
@@ -14,7 +14,7 @@ hist.o init.o input.o jobs.o lex.o linklist.o loop.o math.o \
 mem.o module.o options.o params.o parse.o pattern.o prompt.o signals.o \
 signames.o sort.o string.o subst.o text.o utils.o watch.o"
 
-headers="../config.h system.h zsh.h sigcount.h signals.h \
+headers="../config.h zsh_system.h zsh.h sigcount.h signals.h \
 prototypes.h hashtable.h ztype.h"
 
 :<<\Make
diff --git a/Src/system.h b/Src/zsh_system.h
index f38533023..f38533023 100644
--- a/Src/system.h
+++ b/Src/zsh_system.h