jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

Merge pull request #15 from korli/patch-1 

x86_64 build fix.
This commit is contained in:
Barrett17 2017-01-31 21:09:38 +01:00 committed by GitHub
parent 568187da8d e2cd276b00
commit 43275b5e22
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/ReplicantStatusView.cpp
View File

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

2
build/jam/MainBuildRules
View File

@ -222,7 +222,7 @@ rule ResComp
# considered linker scripts, and thus we can use preprocessor features. # considered linker scripts, and thus we can use preprocessor features.
actions ResComp1 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 actions XRes1

1
libs/Jamfile
View File

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

6
libs/libinterface/BitmapUtils.cpp
View File

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

1
protocols/Jamfile
View File

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