Merge pull request #15 from korli/patch-1

x86_64 build fix.

application/views/ReplicantStatusView.cpp

@@ -246,7 +246,7 @@ void
 ReplicantStatusView::MouseDown(BPoint point)
 {
 
-	unsigned long buttons;
+	uint32 buttons;
 	if (LockLooper()) {
 		GetMouse(&point, &buttons, false);
 		UnlockLooper();

build/jam/MainBuildRules

@@ -222,7 +222,7 @@ rule ResComp
 # considered linker scripts, and thus we can use preprocessor features.
 actions ResComp1
 {
-	cat "$(2[2-])" | $(CC) -E $(CCDEFS) $(HDRS) - | egrep -v '^#' | $(2[1]) $(RCHDRS) --auto-names -o "$(1)" -
+	cat "$(2[2-])" | $(CC) -E $(CCDEFS) $(HDRS) - | egrep -va '^#' | $(2[1]) $(RCHDRS) --auto-names -o "$(1)" -
 }
 
 actions XRes1

libs/Jamfile

@@ -6,6 +6,5 @@ SubInclude TOP libs libsupport ;
 SubInclude TOP libs libinterface ;
 SubInclude TOP libs libimcomm ;
 SubInclude TOP libs libgloox ;
-SubInclude TOP libs libmsn ;
 SubInclude TOP libs libyahoo2 ;
 

libs/libinterface/BitmapUtils.cpp

@@ -121,12 +121,12 @@ RescaleBitmap(const BBitmap* src, float width, float height)
 	void* srcData = src->Bits();
 
 	for (int32 y = 0; y <= height; y++) {
-		void* dstRow = (void*)((uint32)dstData + (uint32)(y * dstYOff));
-		void* srcRow = (void*)((uint32)srcData + ((uint32)(y * dy)
+		void* dstRow = (void*)((uintptr_t)dstData + (uint32)(y * dstYOff));
+		void* srcRow = (void*)((uintptr_t)srcData + ((uint32)(y * dy)
 			* srcYOff));
 
 		for (int32 x = 0; x <= width; x++)
-			memcpy((void*)((uint32)dstRow + (x * bpp)), (void*)((uint32)srcRow
+			memcpy((void*)((uintptr_t)dstRow + (x * bpp)), (void*)((uintptr_t)srcRow
 			+ ((uint32)(x * dx) * bpp)), bpp);
 	}
 

protocols/Jamfile

@@ -5,5 +5,4 @@ CAYA_INCLUDE_DIR = $(TOP) application ;
 # Include all the components.
 SubInclude TOP protocols aim ;
 SubInclude TOP protocols xmpp ;
-SubInclude TOP protocols msn ;
 SubInclude TOP protocols yahoo ;