--- a/dmd/ClassDeclaration.d	Mon Apr 12 16:29:33 2010 +0400
+++ b/dmd/ClassDeclaration.d	Mon Apr 12 17:00:08 2010 +0100
@@ -71,7 +71,7 @@
 
 struct Param
 {
-	int isf(FuncDeclaration fd2)
+	int isf(void*, FuncDeclaration fd2)
 	{
 		//printf("param = %p, fd = %p %s\n", param, fd, fd.toChars());
 		return fd is fd2;
@@ -908,7 +908,7 @@
 			{   
 				Dsymbol s2 = cast(Dsymbol)os.a.data[i];
 				FuncDeclaration f2 = s2.isFuncDeclaration();
-				if (f2 && overloadApply(f2, &p.isf))
+				if (f2 && overloadApply(f2, &p.isf, &p))
 					return false;
 			}
 			return true;
@@ -917,7 +917,7 @@
 		{
 			FuncDeclaration fdstart = s.isFuncDeclaration();
 			//printf("%s fdstart = %p\n", s.kind(), fdstart);
-			return !overloadApply(fdstart, &p.isf);
+			return !overloadApply(fdstart, &p.isf, &p);
 		}
 	}
 }
@@ -1242,10 +1242,10 @@
 		sinit.Sclass = scclass;
 		sinit.Sfl = FLdata;
 	version (ELFOBJ) { // Burton
-		sinit.Sseg = CDATA;
+		sinit.Sseg = Segment.CDATA;
 	}
 	version (MACHOBJ) {
-		sinit.Sseg = DATA;
+		sinit.Sseg = Segment.DATA;
 	}
 		toDt(&sinit.Sdt);
 		outdata(sinit);
@@ -1568,7 +1568,7 @@
 		csym.Sdt = dt;
 	version (ELFOBJ_OR_MACHOBJ) { // Burton
 		// ClassInfo cannot be const data, because we use the monitor on it
-		csym.Sseg = DATA;
+		csym.Sseg = Segment.DATA;
 	}
 		outdata(csym);
 		if (isExport())
@@ -1635,10 +1635,10 @@
 		vtblsym.Sclass = scclass;
 		vtblsym.Sfl = FLdata;
 	version (ELFOBJ) {
-		vtblsym.Sseg = CDATA;
+		vtblsym.Sseg = Segment.CDATA;
 	}
 	version (MACHOBJ) {
-		vtblsym.Sseg = DATA;
+		vtblsym.Sseg = Segment.DATA;
 	}
 		outdata(vtblsym);
 		if (isExport())
@@ -1882,4 +1882,4 @@
 
     ///ClassDeclaration isClassDeclaration() { return cast(ClassDeclaration)this; }	/// huh?
     ClassDeclaration isClassDeclaration() { return this; }
-}
\ No newline at end of file
+}