# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1231743099 -3600
# Node ID a166ba5bdf2d55bf14b1042aea31c03e7bcfb58a
# Parent  eb936607f0718e81da4825b0335a40ee45566ac5# Parent  b52d5de7783f04efc19b6629cc3a2fda813e5292
Automated merge with http://hg.dsource.org/projects/ldc

diff -r b52d5de7783f -r a166ba5bdf2d dmd/man.c
--- a/dmd/man.c	Thu Jan 08 18:20:02 2009 +0100
+++ b/dmd/man.c	Mon Jan 12 07:51:39 2009 +0100
@@ -26,7 +26,7 @@
 
 #endif
 
-#if linux || __APPLE__
+#if linux
 
 #include	<sys/types.h>
 #include	<sys/wait.h>
diff -r b52d5de7783f -r a166ba5bdf2d dmd/mtype.c
--- a/dmd/mtype.c	Thu Jan 08 18:20:02 2009 +0100
+++ b/dmd/mtype.c	Mon Jan 12 07:51:39 2009 +0100
@@ -1662,7 +1662,7 @@
     arguments->push(e);
 
 	if (!dup)
-	    arguments->push(new IntegerExp(0, size, Type::tint32));
+	    arguments->push(new IntegerExp(0, size, Type::tsize_t));
 	e = new CallExp(e->loc, ec, arguments);
 	e->type = next->arrayOf();
     }
diff -r b52d5de7783f -r a166ba5bdf2d dmd2/mtype.c
--- a/dmd2/mtype.c	Thu Jan 08 18:20:02 2009 +0100
+++ b/dmd2/mtype.c	Mon Jan 12 07:51:39 2009 +0100
@@ -1890,7 +1890,7 @@
     arguments->push(e);
 
 	if (!dup)
-	    arguments->push(new IntegerExp(0, size, Type::tint32));
+	    arguments->push(new IntegerExp(0, size, Type::tsize_t));
 	e = new CallExp(e->loc, ec, arguments);
 	if (ident == Id::idup)
 	{   Type *einv = next->invariantOf();
diff -r b52d5de7783f -r a166ba5bdf2d gen/typinf.cpp
--- a/gen/typinf.cpp	Thu Jan 08 18:20:02 2009 +0100
+++ b/gen/typinf.cpp	Mon Jan 12 07:51:39 2009 +0100
@@ -522,7 +522,7 @@
 
 /* ========================================================================= */
 
-static LLConstant* LLVM_D_Declare_TypeInfoBase(TypeInfoDeclaration* tid, ClassDeclaration* cd)
+static void LLVM_D_Declare_TypeInfoBase(TypeInfoDeclaration* tid, ClassDeclaration* cd)
 {
     ClassDeclaration* base = cd;
     DtoResolveClass(base);
@@ -531,7 +531,7 @@
     tid->ir.irGlobal->value = new llvm::GlobalVariable(tid->ir.irGlobal->type.get(), true,llvm::GlobalValue::WeakLinkage,NULL,tid->toChars(),gIR->module);
 }
 
-static LLConstant* LLVM_D_Define_TypeInfoBase(Type* basetype, TypeInfoDeclaration* tid, ClassDeclaration* cd)
+static void LLVM_D_Define_TypeInfoBase(Type* basetype, TypeInfoDeclaration* tid, ClassDeclaration* cd)
 {
     ClassDeclaration* base = cd;
     DtoForceConstInitDsymbol(base);