From f8b01a88a549af6de1cca03b19300b8767320b1b Mon Sep 17 00:00:00 2001
From: Walter Bright <walter@digitalmars.com>
Date: Fri, 13 Nov 2009 02:31:11 +0000
Subject: [PATCH] fixe makefile for 64 bits

---
 etc/c/zlib/osx.mak | 156 ++++++++++++++++++++++-----------------------
 std/math.d         |   2 +-
 2 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/etc/c/zlib/osx.mak b/etc/c/zlib/osx.mak
index c2304b023..a7db54c5c 100644
--- a/etc/c/zlib/osx.mak
+++ b/etc/c/zlib/osx.mak
@@ -1,78 +1,78 @@
-# Makefile for zlib
-
-CC=gcc
-LD=link
-CFLAGS=-O -m32
-LDFLAGS=
-O=.o
-
-.c.o:
-	$(CC) -c $(CFLAGS) $*
-
-.d.o:
-	$(DMD) -c $(DFLAGS) $*
-
-# variables
-OBJS = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
-       trees$(O) zutil$(O) inflate$(O) infback$(O) inftrees$(O) inffast$(O)
-
-all:  zlib.a example minigzip
-
-adler32.o: adler32.c zlib.h zconf.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-compress.o: compress.c zlib.h zconf.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-crc32.o: crc32.c zlib.h zconf.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-deflate.o: deflate.c deflate.h zutil.h zlib.h zconf.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-gzio.o: gzio.c zutil.h zlib.h zconf.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-infback.o: infback.c zlib.h zconf.h inftrees.h inflate.h inffast.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-inflate.o: inflate.c zlib.h zconf.h inftrees.h inflate.h inffast.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-inftrees.o: inftrees.c zlib.h zconf.h inftrees.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-inffast.o: inffast.c zlib.h zconf.h inftrees.h inflate.h inffast.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-trees.o: trees.c deflate.h zutil.h zlib.h zconf.h trees.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-uncompr.o: uncompr.c zlib.h zconf.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-zutil.o: zutil.c zutil.h zlib.h zconf.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-example.o: example.c zlib.h zconf.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-minigzip.o: minigzip.c zlib.h zconf.h
-	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-zlib.a: $(OBJS)
-	ar -r $@ $(OBJS)
-
-example: example.o zlib.a
-	$(CC) -o $@ example.o zlib.a -g
-
-minigzip: minigzip.o zlib.a
-	$(CC) -o $@ minigzip.o zlib.a -g
-
-test: example minigzip
-	./example
-	echo hello world | minigzip | minigzip -d 
-
-clean:
-	$(RM) $(OBJS) zlib.a example.o example minigzip minigzip.o test foo.gz
-
+# Makefile for zlib
+
+CC=gcc
+LD=link
+CFLAGS=-O -m32
+LDFLAGS=
+O=.o
+
+.c.o:
+	$(CC) -c $(CFLAGS) $*
+
+.d.o:
+	$(DMD) -c $(DFLAGS) $*
+
+# variables
+OBJS = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
+       trees$(O) zutil$(O) inflate$(O) infback$(O) inftrees$(O) inffast$(O)
+
+all:  zlib.a example minigzip
+
+adler32.o: adler32.c zlib.h zconf.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+compress.o: compress.c zlib.h zconf.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+crc32.o: crc32.c zlib.h zconf.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+deflate.o: deflate.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+gzio.o: gzio.c zutil.h zlib.h zconf.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+infback.o: infback.c zlib.h zconf.h inftrees.h inflate.h inffast.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+inflate.o: inflate.c zlib.h zconf.h inftrees.h inflate.h inffast.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+inftrees.o: inftrees.c zlib.h zconf.h inftrees.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+inffast.o: inffast.c zlib.h zconf.h inftrees.h inflate.h inffast.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+trees.o: trees.c deflate.h zutil.h zlib.h zconf.h trees.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+uncompr.o: uncompr.c zlib.h zconf.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+zutil.o: zutil.c zutil.h zlib.h zconf.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+example.o: example.c zlib.h zconf.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+minigzip.o: minigzip.c zlib.h zconf.h
+	$(CC) -c $(cvarsdll) $(CFLAGS) $*.c
+
+zlib.a: $(OBJS)
+	ar -r $@ $(OBJS)
+
+example: example.o zlib.a
+	$(CC) $(CFLAGS) -o $@ example.o zlib.a -g
+
+minigzip: minigzip.o zlib.a
+	$(CC) $(CFLAGS) -o $@ minigzip.o zlib.a -g
+
+test: example minigzip
+	./example
+	echo hello world | minigzip | minigzip -d 
+
+clean:
+	$(RM) $(OBJS) zlib.a example.o example minigzip minigzip.o test foo.gz
+
diff --git a/std/math.d b/std/math.d
index 9ae66c5b3..d358389ad 100644
--- a/std/math.d
+++ b/std/math.d
@@ -49,7 +49,7 @@
  *    (See accompanying file LICENSE_1_0.txt or copy at
  *          http://www.boost.org/LICENSE_1_0.txt)
  */
-module(system) std.math;
+module std.math;
 
 //debug=math;           // uncomment to turn on debugging printf's