i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added more things to x86_64 image.

Browse Source 
Some preference apps, mount_server and AboutSystem. Removed the check
for x86_64 in the boot script, the normal path through the script will
work now. Also removed a temporary hack to workaround AboutSystem not
being there in build_haiku_image.
This commit is contained in:
Alex Smith
2012-08-10 09:32:54 +01:00
parent e963289800
commit 5084d0d451
18 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/KeyboardLayout.cpp
+1 -1
View File
@@ -332,7 +332,7 @@ KeyboardLayout::_Error(const parse_state& state, const char* reason, ...)
va_list args;
va_start(args, reason);
fprintf(stderr, "Syntax error in line %ld: ", state.line);
fprintf(stderr, "Syntax error in line %" B_PRId32 ": ", state.line);
vfprintf(stderr, reason, args);
fprintf(stderr, "\n");
src/preferences/keymap/KeyboardLayoutView.cpp
+3 -3
View File
@@ -590,7 +590,7 @@ KeyboardLayoutView::_DrawKey(BView* view, BRect updateRect, const Key* key,
fDeadKey);
} else {
// Show the key code if there is no keymap
snprintf(text, sizeof(text), "%02lx", key->code);
snprintf(text, sizeof(text), "%02" B_PRIx32, key->code);
}
_SetFontSize(view, keyKind);
@@ -821,7 +821,7 @@ bool
KeyboardLayoutView::_FunctionKeyLabel(uint32 code, char* text, size_t textSize)
{
if (code >= B_F1_KEY && code <= B_F12_KEY) {
snprintf(text, textSize, "F%ld", code + 1 - B_F1_KEY);
snprintf(text, textSize, "F%" B_PRId32, code + 1 - B_F1_KEY);
return true;
}
@@ -1016,7 +1016,7 @@ KeyboardLayoutView::_KeyChanged(const BMessage* message)
checkSingle = false;
if (_KeyForCode(key) == NULL)
printf("no key for code %ld\n", key);
printf("no key for code %" B_PRId32 "\n", key);
}
for (int32 i = 0; i < 16; i++) {