Ticket #9354: 0001-Compilation-fixes-for-x86_64.patch

build/jam/Haiku64Image

@@ -6 +6 @@
 # easily add things to the image as I port them.
 
 
-SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr checkfs
-    chgrp chmod chown chroot cksum clear clockconfig cmp collectcatkeys comm
-    compress copyattr cp csplit cut date dd diff diff3 dircolors dirname df du
-    dumpcatalog echo eject env error expand expr factor false find finddir
-    fmt fold fortune ftp gawk gdb gzip gzexe getlimits groups head hostname
-    id ifconfig <bin>install isvolume join kernel_debugger kill less lessecho
-    lesskey link linkcatkeys listdev ln locale locate logger logname ls
-    makebootable md5sum mimeset mkdir mkfifo mkfs mktemp mount mountvolume
-    mv nl nohup notify nproc od open paste patch pathchk ping pr printenv printf
-    ps ptx pwd query rc readlink ReadOnlyBootPrompt rm rmattr rmdir safemode
-    sdiff seq sha1sum shred shuf shutdown sleep sort split stat strace stty su sum sync
-    sysinfo tac tail tee test timeout touch tr true truncate tsort tty unexpand
-    uname uniq unlink unmount unzip <bin>updatedb waitfor wc wget whoami xargs
-    xres yes zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit
-    zmore znew
+SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep cal cat catattr
+    checkfs chgrp chmod chown chroot cksum clear clockconfig cmp
+    collectcatkeys comm compress copyattr CortexAddOnHost cp csplit cut date
+    dd diff diff3 dircolors dirname df du dumpcatalog echo eject env error
+    expand expr factor false find finddir fmt fold fortune ftp gawk gdb gzip
+    gzexe getlimits groups head hostname id ifconfig <bin>install isvolume
+    join kernel_debugger kill less lessecho lesskey link linkcatkeys listdev
+    ln locale locate logger logname ls makebootable md5sum mimeset mkdir
+    mkfifo mkfs mktemp mount mountvolume mv nl nohup notify nproc od open
+    paste patch pathchk ping pr printenv printf ps ptx pwd query rc readlink
+    ReadOnlyBootPrompt rm rmattr rmdir safemode sdiff seq sha1sum shred shuf
+    shutdown sleep sort split stat strace stty su sum sync sysinfo tac tail
+    tee test timeout touch tr true truncate tsort tty unexpand uname uniq
+    unlink unmount unzip <bin>updatedb waitfor wc wget whoami xargs xres yes
+    zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
 ;
 
-SYSTEM_APPS = AboutSystem ActivityMonitor Debugger DriveSetup Installer
-    NetworkStatus ProcessController StyledEdit Terminal
+SYSTEM_APPS = AboutSystem ActivityMonitor CDPlayer CharacterMap Debugger DeskCalc
+    Devices DiskUsage DriveSetup Expander Installer LaunchBox MediaConverter
+    NetworkStatus PoorMan Pulse ProcessController Screenshot ShowImage
+    SoundRecorder StyledEdit Terminal TV Workspaces
 ;
 
-SYSTEM_PREFERENCES = Appearance Backgrounds <preference>Deskbar FileTypes
-    Keyboard Keymap Locale Mouse Network Notifications Screen Time Touchpad
-    <preference>Tracker VirtualMemory
+SYSTEM_PREFERENCES = Appearance Backgrounds DataTranslations <preference>Deskbar
+    FileTypes Keyboard Keymap Locale Media Mouse Network Notifications
+    Printers Screen ScreenSaver Time Touchpad <preference>Tracker
+    VirtualMemory
 ;
 
-SYSTEM_DEMOS = Sudoku ;
+SYSTEM_DEMOS = BSnow Cortex FontDemo OverlayImage Pairs Sudoku ;
 
-SYSTEM_LIBS = libbe.so libbsd.so libbnetapi.so libdebug.so libmedia.so
+SYSTEM_LIBS = libbe.so libbsd.so libbnetapi.so libgame.so libdebug.so libmedia.so
     libnetwork.so <revisioned>libroot.so libroot-addon-icu.so
     libtextencoding.so libtiff.so libtracker.so libtranslation.so
     $(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
@@ -48 +51 @@
     libilmimf.so
 ;
 
-SYSTEM_SERVERS = app_server debug_server input_server mount_server
-    net_server notification_server registrar syslog_daemon
+SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server midi_server
+    mount_server net_server notification_server power_daemon print_server
+    print_addon_server registrar syslog_daemon
 ;
 
 SYSTEM_NETWORK_DEVICES = ethernet loopback ;
@@ -65 +69 @@
     TIFFTranslator WebPTranslator WonderBrushTranslator
 ;
 
+SYSTEM_ADD_ONS_PRINT =
+    Canon\ LIPS3\ Compatible
+    Canon\ LIPS4\ Compatible
+    Gutenprint
+    PCL5\ Compatible
+    PCL6\ Compatible
+    PDF\ Writer
+    PS\ Compatible
+
+;
+
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = vesa ;
 SYSTEM_ADD_ONS_DRIVERS_NET = 3com atheros813x ar81xx attansic_l1 attansic_l2
     broadcom440x broadcom570x dec21xxx etherpci ipro100 ipro1000 jmicron2x0

src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp

@@ -425 +425 @@
 DocInfoWindow::_EmptyKeyList()
 {
     while (fKeyList->CountItems() > 0L)
-        delete fKeyList->RemoveItem(0L);
+        delete fKeyList->RemoveItem((int32)0);
 }
 
 

src/add-ons/print/drivers/pdf/source/PrinterDriver.cpp

@@ -201 +201 @@
 {
     char text[128];
 
-    sprintf(text, "Faking print of page %ld/%ld...", pageNumber, pageCount);
+    sprintf(text, "Faking print of page %" B_PRId32 "/%" B_PRId32 "...", pageNumber, pageCount);
     BAlert *alert = new BAlert("PrinterDriver::PrintPage()", text, "Hmm?");
     alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
     alert->Go();

src/apps/bsnow/SnowView.cpp

@@ -169 +169 @@
         fFallenReg = new BRegion;
         fInvalidator = spawn_thread(SnowMakerThread, INVALIDATOR_THREAD_NAME, B_LOW_PRIORITY, (void *)this);
         resume_thread(fInvalidator);
-        printf("BSnow: OK: ws = %ld x %ld\n", fCachedWsWidth, fCachedWsHeight);
+        printf("BSnow: OK: ws = %" B_PRId32 " x %" B_PRId32 "\n", fCachedWsWidth, fCachedWsHeight);
 #ifdef DEBUG
         Window()->AddCommonFilter(new BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE, msgfilter));
 #endif
@@ -326 +326 @@
     if (fCachedWsWidth != pFrame.Width() || fCachedWsHeight != pFrame.Height()) {
         fCachedWsWidth = pFrame.IntegerWidth();
         fCachedWsHeight = pFrame.IntegerHeight();
-        printf("BSnow: Parent resized to %ld %ld\n", fCachedWsWidth, fCachedWsHeight);
+        printf("BSnow: Parent resized to %" B_PRId32 " %" B_PRId32 "\n", fCachedWsWidth, fCachedWsHeight);
         fFallenReg->MakeEmpty(); /* remove all the fallen snow */
         ResizeTo(pFrame.IntegerWidth(), pFrame.IntegerHeight());
         fDragger->MoveTo(pFrame.IntegerWidth()-7, pFrame.IntegerHeight()-7);

src/apps/cdplayer/CDDBSupport.cpp

@@ -245 +245 @@
                     time->SetMinutes(0);
                     time->SetSeconds(0);
 
-                    STRACE(("CDDBData::Load: Adding Track %s (%ld:%ld)\n", newTrack->String(),
+                    STRACE(("CDDBData::Load: Adding Track %s (%" B_PRId32 ":%" B_PRId32 ")\n", newTrack->String(),
                             time->minutes, time->seconds));
 
                     fTrackList.AddItem(newTrack);
@@ -332 +332 @@
     BString entry;
     char timestring[10];
 
-    sprintf(timestring,"%.2ld:%.2ld", fDiscTime.GetMinutes(), fDiscTime.GetSeconds());
+    sprintf(timestring,"%.2" B_PRId32 ":%.2" B_PRId32 "", fDiscTime.GetMinutes(), fDiscTime.GetSeconds());
 
     entry << fArtist << " - " << fAlbum << "\t" << timestring << "\n";
     file.Write(entry.String(), entry.Length());
@@ -351 +351 @@
 
         entry = *trackstr;
 
-        sprintf(timestring,"%.2ld:%.2ld", time->GetMinutes(), time->GetSeconds());
+        sprintf(timestring,"%.2" B_PRId32 ":%.2" B_PRId32 "", time->GetMinutes(), time->GetSeconds());
 
         entry << "\t" << timestring << "\n";
         file.Write(entry.String(), entry.Length());
@@ -361 +361 @@
     }
 
     file.WriteAttr("CD:key", B_INT32_TYPE, 0, &fDiscID, sizeof(int32));
-    STRACE(("CDDBData::Save: Wrote CD identifier: %ld(%lx)\n", fDiscID, fDiscID));
+    STRACE(("CDDBData::Save: Wrote CD identifier: %" B_PRId32 "(%" B_PRIx32 ")\n", fDiscID, fDiscID));
     file.WriteAttr("CD:tracks", B_STRING_TYPE, 0, tracksattr.String(), tracksattr.Length() + 1);
 
     if (fGenre.CountChars() > 0)
@@ -391 +391 @@
 
     BString *name = (BString*)fTrackList.ItemAt(index);
     if (name) {
-        STRACE(("CDDBData::RenameTrack(%ld,%s)\n", index, newName));
+        STRACE(("CDDBData::RenameTrack(%" B_PRId32 ",%s)\n", index, newName));
         name->SetTo(newName);
         return true;
     }
@@ -409 +409 @@
         STRACE(("CDDBData::AddTrack failed - NULL name\n"));
         return;
     }
-    STRACE(("CDDBData::AddTrack(%s, %ld:%.2ld,%d)\n", track, time.minutes, time.seconds, index));
+    STRACE(("CDDBData::AddTrack(%s, %" B_PRId32 ":%.2" B_PRId32 ",%d)\n", track, time.minutes, time.seconds, index));
 
     fTrackList.AddItem(new BString(track));
     fTimeList.AddItem(new CDAudioTime(time));
@@ -691 +691 @@
 
     // Query for the existence of the disc in the database
     char idString[10];
-    sprintf(idString, "%08lx", fCDData.DiscID());
+    sprintf(idString, "%08" B_PRIx32 "", fCDData.DiscID());
     BString query;
 
     int32 trackCount = GetTrackCount(&fSCSIData);

src/apps/charactermap/CharacterWindow.cpp

@@ -60 +60 @@
 protected:
     const char* UpdateText() const
     {
-        snprintf(fText, sizeof(fText), "%ldpt", Value());
+        snprintf(fText, sizeof(fText), "%" B_PRId32 "pt", Value());
         return fText;
     }
 
@@ -310 +310 @@
                 sizeof(utf8Hex));
 
             char text[128];
-            snprintf(text, sizeof(text), " %s: %#lx (%ld), UTF-8: %s",
+            snprintf(text, sizeof(text), " %s: %#" B_PRIx32 " (%" B_PRId32 "), UTF-8: %s",
                 B_TRANSLATE("Code"), character, character, utf8Hex);
 
             char glyph[20];

src/apps/cortex/TransportView/TransportView.cpp

@@ -528 +528 @@
     err = m_manager->findGroup(groupID, &m_group);
     if(err < B_OK) {
         PRINT((
-            "* TransportView::_selectGroup(%ld): findGroup() failed:\n"
+            "* TransportView::_selectGroup(%" B_PRId32 "): findGroup() failed:\n"
             "  %s\n",
             groupID,
             strerror(err)));
@@ -784 +784 @@
             B_RAW_TYPE,
             &r->node(),
             sizeof(media_node));
-        sprintf(nameBuffer, "%s: %ld",
+        sprintf(nameBuffer, "%s: %" B_PRId32 "",
             r->name(),
             r->id());
         i = new BMenuItem(
@@ -1088 +1088 @@
     if(err < B_OK)
         return;
         
-//  PRINT(("### _timeSourceCreated(): %ld\n", id));
+//  PRINT(("### _timeSourceCreated(): %" B_PRId32 "\n", id));
     NodeRef* ref;
     err = m_manager->getNodeRef(id, &ref);
     if(err < B_OK) {
         PRINT((
-            "!!! TransportView::_timeSourceCreated(): node %ld doesn't exist\n",
+            "!!! TransportView::_timeSourceCreated(): node %" B_PRId32 " doesn't exist\n",
             id));
         return; 
     }
@@ -1105 +1105 @@
         B_RAW_TYPE,
         &ref->node(),
         sizeof(media_node));
-    sprintf(nameBuffer, "%s: %ld",
+    sprintf(nameBuffer, "%s: %" B_PRId32 "",
         ref->name(),
         ref->id());
     BMenuItem* i = new BMenuItem(
@@ -1126 +1126 @@
     if(err < B_OK)
         return;
         
-//  PRINT(("### _timeSourceDeleted(): %ld\n", id));
+//  PRINT(("### _timeSourceDeleted(): %" B_PRId32 "\n", id));
 
     BMenu* menu = m_timeSourceView->Menu();
     ASSERT(menu);

src/apps/deskcalc/DeskCalc.cpp

@@ -38 +38 @@
             BString result = parser.Evaluate(expression.String());
             printf("%s\n", result.String());
         } catch (ParseException e) {
-            printf("%s at %ld\n", e.message.String(), e.position + 1);
+            printf("%s at %" B_PRId32 "\n", e.message.String(), e.position + 1);
             return 1;
         }
     }

src/apps/deskcalc/ExpressionTextView.cpp

@@ -373 +373 @@
         return;
     }
     while (fPreviousExpressions.CountItems() > kMaxPreviousExpressions)
-        delete (BString*)fPreviousExpressions.RemoveItem(0L);
+        delete (BString*)fPreviousExpressions.RemoveItem((int32)0);
 
     fHistoryPos = fPreviousExpressions.CountItems();
 }

src/apps/fontdemo/ControlView.cpp

@@ -380 +380 @@
                         printf("Failed to add style or family to the message\n");
                         return;
                     }
-                    printf("InstalledStyles(%ld), Font(%s), Style(%s)\n",
+                    printf("InstalledStyles(%" B_PRId32 "), Font(%s), Style(%s)\n",
                         installedStyles, newFontFamilyItem->Label(),
                         newstyleitem->Label());
                     _UpdateAndSendStyle(msg);

src/apps/mediaconverter/MediaConverterApp.cpp

@@ -525 +525 @@
         for (int64 i = start; (i <= end) && !fCancel; i += framesRead) {
             if ((ret = inVidTrack->ReadFrames(videoBuffer, &framesRead,
                     &mh)) != B_OK) {
-                fprintf(stderr, "Error reading video frame %Ld: %s\n", i,
+                fprintf(stderr, "Error reading video frame %" B_PRId64 ": %s\n", i,
                         strerror(ret));
                 snprintf(status.LockBuffer(128), 128,
-                        B_TRANSLATE("Error read video frame %Ld"), i);
+                        B_TRANSLATE("Error read video frame %" B_PRId64 ""), i);
                 status.UnlockBuffer();
                 SetStatusMessage(status.String());
 
@@ -537 +537 @@
 
             if ((ret = outVidTrack->WriteFrames(videoBuffer, framesRead,
                     mh.u.encoded_video.field_flags)) != B_OK) {
-                fprintf(stderr, "Error writing video frame %Ld: %s\n", i,
+                fprintf(stderr, "Error writing video frame %" B_PRId64 ": %s\n", i,
                         strerror(ret));
                 snprintf(status.LockBuffer(128), 128,
-                        B_TRANSLATE("Error writing video frame %Ld"), i);
+                        B_TRANSLATE("Error writing video frame %" B_PRId64 ""), i);
                 status.UnlockBuffer();
                 SetStatusMessage(status.String());
 
@@ -551 +551 @@
             if (currPercent > lastPercent) {
                 lastPercent = currPercent;
                 snprintf(status.LockBuffer(128), 128,
-                    B_TRANSLATE("Writing video track: %ld%% complete"),
+                    B_TRANSLATE("Writing video track: %" B_PRId32 "%% complete"),
                     currPercent);
                 status.UnlockBuffer();
                 SetStatusMessage(status.String());
@@ -587 +587 @@
                 &mh)) != B_OK) {
                 fprintf(stderr, "Error reading audio frames: %s\n", strerror(ret));
                 snprintf(status.LockBuffer(128), 128,
-                    B_TRANSLATE("Error read audio frame %Ld"), i);
+                    B_TRANSLATE("Error read audio frame %" B_PRId64 ""), i);
                 status.UnlockBuffer();
                 SetStatusMessage(status.String());
 
@@ -598 +598 @@
                 framesRead)) != B_OK) {
                 fprintf(stderr, "Error writing audio frames: %s\n", strerror(ret));
                 snprintf(status.LockBuffer(128), 128,
-                    B_TRANSLATE("Error writing audio frame %Ld"), i);
+                    B_TRANSLATE("Error writing audio frame %" B_PRId64 ""), i);
                 status.UnlockBuffer();
                 SetStatusMessage(status.String());
 
@@ -609 +609 @@
             if (currPercent > lastPercent) {
                 lastPercent = currPercent;
                 snprintf(status.LockBuffer(128), 128,
-                    B_TRANSLATE("Writing audio track: %ld%% complete"),
+                    B_TRANSLATE("Writing audio track: %" B_PRId32 "%% complete"),
                     currPercent);
                 status.UnlockBuffer();
                 SetStatusMessage(status.String());

src/apps/mediaconverter/MediaConverterWindow.cpp

@@ -501 +501 @@
     BMenu* menu = fAudioMenu->Menu();
     BMenuItem* item;
     // clear out old audio codec menu items
-    while ((item = menu->RemoveItem(0L)) != NULL)
+    while ((item = menu->RemoveItem((int32)0)) != NULL)
         delete item;
 
     bool separator = true;
@@ -558 +558 @@
 
     // clear out old video codec menu items
     menu = fVideoMenu->Menu();
-    while ((item = menu->RemoveItem(0L)) != NULL)
+    while ((item = menu->RemoveItem((int32)0)) != NULL)
         delete item;
 
     separator = true;

src/apps/pairs/PairsView.cpp

@@ -183 +183 @@
     }
 
     // delete the remaining bitmaps from the list
-    while (BBitmap* bitmap = (BBitmap*)bitmaps.RemoveItem(0L))
+    while (BBitmap* bitmap = (BBitmap*)bitmaps.RemoveItem((int32)0))
         delete bitmap;
 }
 

src/apps/poorman/StatusSlider.cpp

@@ -23 +23 @@
 const char*
 StatusSlider::UpdateText() const
 {
-    sprintf(fTemp, "%ld %s", Value(), fStatusPrefix);
+    sprintf(fTemp, "%" B_PRId32 " %s", Value(), fStatusPrefix);
 
     return fTemp;
 }

src/apps/poorman/libhttpd/libhttpd.c

@@ -2921 +2921 @@
 
         /* And print. */
         (void)  fprintf( fp,
-           "%10lld  %s  <A HREF=\"/%.500s%s\">%.80s</A>%s%s%s\n",
+           "%10" B_PRId64 "  %s  <A HREF=\"/%.500s%s\">%.80s</A>%s%s%s\n",
             (int64_t) lsb.st_size,
             timestr, encrname, S_ISDIR(sb.st_mode) ? "/" : "",
             nameptrs[i], linkprefix, link, fileclass );

src/apps/showimage/ShowImageWindow.cpp

@@ -711 +711 @@
 
                 while (fGoToPageMenu->CountItems() > 0) {
                     // Remove all page numbers
-                    delete fGoToPageMenu->RemoveItem(0L);
+                    delete fGoToPageMenu->RemoveItem((int32)0);
                 }
 
                 for (int32 i = 1; i <= pages; i++) {

src/apps/soundrecorder/FileUtils.cpp

@@ -27 +27 @@
     struct stat src_stat;
     status_t err = src.GetStat(&src_stat);
     if (err != B_OK) {
-        printf("couldn't get stat: %#010lx\n", err);
+        printf("couldn't get stat: %#010" B_PRIx32 "\n", err);
         return err;
     }
         

src/apps/soundrecorder/RecorderWindow.cpp

@@ -457 +457 @@
         error = fRoster->GetDormantNodes(dni, &real_count, 0, &output_format,
             0, B_BUFFER_PRODUCER | B_PHYSICAL_INPUT);
         if (real_count > maxInputCount) {
-            WINDOW((stderr, "dropped %ld inputs\n", real_count - maxInputCount));
+            WINDOW((stderr, "dropped %" B_PRId32 " inputs\n", real_count - maxInputCount));
             real_count = maxInputCount;
         }
         char selected_name[B_MEDIA_NAME_LENGTH] = "Default input";
@@ -1172 +1172 @@
 {
     char msg[300];
     if (err != B_OK)
-        sprintf(msg, "%s: %s. [%lx]", action, strerror(err), (int32) err);
+        sprintf(msg, "%s: %s. [%" B_PRId32 "]", action, strerror(err), (int32) err);
     else
         sprintf(msg, "%s.", action);
     BAlert* alert = new BAlert("", msg, B_TRANSLATE("Stop"));

src/apps/soundrecorder/TrackSlider.cpp

@@ -408 +408 @@
     uint32 seconds = timestamp / 1000000LL;
     timestamp -= seconds * 1000000LL;
     uint32 centiseconds = timestamp / 10000LL;
-    sprintf(string, "%02ld:%02ld:%02ld:%02ld", hours, minutes, seconds, 
+    sprintf(string, "%02" B_PRId32 ":%02" B_PRId32 ":%02" B_PRId32 ":%02" B_PRId32 "", hours, minutes, seconds, 
         centiseconds);
 }
 

src/apps/tv/Controller.cpp

@@ -147 +147 @@
         printf("  name '%s'\n", parameter->Name());
         printf("  kind '%s'\n", parameter->Kind());
         printf("  unit '%s'\n", parameter->Unit());
-        printf("  flags 0x%08lx\n", parameter->Flags());
+        printf("  flags 0x%08" B_PRIx32 "\n", parameter->Flags());
         
         // XXX TODO: matching on Name is weak
         if (strcmp(parameter->Name(), "Channel") == 0 || strcmp(parameter->Kind(), B_TUNER_CHANNEL) == 0) {

src/apps/tv/DeviceRoster.cpp

@@ -41 +41 @@
     err = MediaRoster()->GetLiveNodes(info, &info_count, NULL, NULL, "DVB*", 
         B_BUFFER_PRODUCER | B_PHYSICAL_INPUT);
     if (err != B_OK || info_count < 1) { 
-        printf("Can't find live DVB node. Found %ld nodes, error %08lx (%s)\n",
+        printf("Can't find live DVB node. Found %" B_PRId32 " nodes, error %08" B_PRIx32 " (%s)\n",
             info_count, err, strerror(err));
         fDeviceCount = 0;
     } else {

src/apps/tv/MainWin.cpp

@@ -974 +974 @@
     uint32 raw_char  = msg->FindInt32("raw_char");
     uint32 modifiers = msg->FindInt32("modifiers");
 
-    printf("key 0x%lx, raw_char 0x%lx, modifiers 0x%lx\n", key, raw_char,
+    printf("key 0x%" B_PRIx32 ", raw_char 0x%" B_PRIx32 ", modifiers 0x%" B_PRIx32 "\n", key, raw_char,
         modifiers);
 
     switch (raw_char) {

src/apps/tv/VideoNode.cpp

@@ -446 +446 @@
         printf("VideoNode::CreateBuffers failed\n");
         return B_ERROR;
     }
-    printf("overlay bitmap: got: bytes per row: %ld\n", 
+    printf("overlay bitmap: got: bytes per row: %" B_PRId32 "\n", 
         fBitmap->BytesPerRow());
     fOverlayActive = overlay;
     UnlockBitmap();

src/bin/network/arp/arp.cpp

@@ -270 +270 @@
         char *rest = line;
         const char *argument = next_argument(&rest);
         if (argument == NULL) {
-            fprintf(stderr, "%s: Line %ld is invalid (missing hostname).\n",
+            fprintf(stderr, "%s: Line %" B_PRId32 " is invalid (missing hostname).\n",
                 kProgramName, counter);
             continue;
         }
@@ -280 +280 @@
             // get host by name
             struct hostent *host = gethostbyname(argument);
             if (host == NULL) {
-                fprintf(stderr, "%s: Line %ld, host \"%s\" is not known in the IPv4 domain: %s\n",
+                fprintf(stderr, "%s: Line %" B_PRId32 ", host \"%s\" is not known in the IPv4 domain: %s\n",
                     kProgramName, counter, argument, strerror(errno));
                 continue;
             }
             if (host->h_addrtype != AF_INET) {
-                fprintf(stderr, "%s: Line %ld, host \"%s\" is not known in the IPv4 domain.\n",
+                fprintf(stderr, "%s: Line " B_PRId32 ", host \"%s\" is not known in the IPv4 domain.\n",
                     kProgramName, counter, argument);
                 continue;
             }
@@ -299 +299 @@
 
         argument = next_argument(&rest);
         if (argument == NULL) {
-            fprintf(stderr, "%s: Line %ld is invalid (missing ethernet address).\n",
+            fprintf(stderr, "%s: Line %" B_PRId32 " is invalid (missing ethernet address).\n",
                 kProgramName, counter);
             continue;
         }
 
         uint8 ethernetAddress[6];
         if (!parse_ethernet_address(argument, ethernetAddress)) {
-            fprintf(stderr, "%s: Line %ld, \"%s\" is not a valid ethernet address.\n",
+            fprintf(stderr, "%s: Line %" B_PRId32 ", \"%s\" is not a valid ethernet address.\n",
                 kProgramName, counter, argument);
             continue;
         }
@@ -316 +316 @@
         uint32 flags = ARP_FLAG_PERMANENT;
         while ((argument = next_argument(&rest)) != NULL) {
             if (!set_flags(flags, argument)) {
-                fprintf(stderr, "%s: Line %ld, ignoring invalid flag \"%s\".\n",
+                fprintf(stderr, "%s: Line %" B_PRId32 ", ignoring invalid flag \"%s\".\n",
                     kProgramName, counter, argument);
             }
         }
 
         status_t status = set_entry(&address, ethernetAddress, flags);
         if (status != B_OK) {
-            fprintf(stderr, "%s: Line %ld, ARP entry could not been set: %s\n",
+            fprintf(stderr, "%s: Line %" B_PRId32 ", ARP entry could not been set: %s\n",
                 kProgramName, counter, strerror(status));
         }
     }

src/kits/game/WindowScreen.cpp

@@ -536 +536 @@
     CALLED();
     if (fDebugState) {
         fprintf(stderr, "## Debugger(\"%s\").", label);
-        fprintf(stderr, " Press Alt-F%ld or Cmd-F%ld to resume.\n",
+        fprintf(stderr, " Press Alt-F%" B_PRId32 " or Cmd-F%" B_PRId32 " to resume.\n",
             fWorkspaceIndex + 1, fWorkspaceIndex + 1);
 
         if (IsLocked())

src/kits/midi2/MidiRosterLooper.cpp

@@ -47 +47 @@
         BMidiEndpoint* endp = EndpointAt(t);
         if (endp->fRefCount > 0) {
             fprintf(
-                stderr, "[midi] WARNING: Endpoint %ld (%p) has "
-                "not been Release()d properly (refcount = %ld)\n", 
+                stderr, "[midi] WARNING: Endpoint %" B_PRId32 " (%p) has "
+                "not been Release()d properly (refcount = %" B_PRId32 ")\n", 
                 endp->ID(), endp, endp->fRefCount);
         } else {
             delete endp;

src/kits/print/PicturePrinter.cpp

@@ -399 +399 @@
     if (flags == 0) Print("none set");
     PRINT_FLAG(B_DISABLE_ANTIALIASING);
     PRINT_FLAG(B_FORCE_ANTIALIASING);
-    if (flags != f) printf("Unknown Additional Flags %ld", flags & ~f);
+    if (flags != f) printf("Unknown Additional Flags %" B_PRId32 "", flags & ~f);
     Cr();
 }
 
@@ -420 +420 @@
     PRINT_FLAG(B_OUTLINED_FACE);
     PRINT_FLAG(B_UNDERSCORE_FACE);
     PRINT_FLAG(B_STRIKEOUT_FACE);
-    if (flags != f) printf("Unknown Additional Flags %ld", flags & ~f);
+    if (flags != f) printf("Unknown Additional Flags %" B_PRId32 "", flags & ~f);
     Cr();
 }
 

src/kits/print/PrinterDriverAddOn.cpp

@@ -143 +143 @@
     // This seems to be required for legacy?
     // HP PCL3 add-on crashes without it!
     BMessage parameters(B_REFS_RECEIVED);
-    parameters.AddInt32("file", (int32)&file);
-    parameters.AddInt32("printer", (int32)spoolFolder);
+    parameters.AddInt32("file", (addr_t)&file);
+    parameters.AddInt32("printer", (addr_t)spoolFolder);
 
     BMessage* message = (*func)(&file, spoolFolder, &parameters);
     if (message == NULL || message->what != 'okok')

src/libs/icon/message/MessageImporter.cpp

@@ -182 +182 @@
         int32 styleIndex;
         if (shapeArchive.FindInt32("style ref", &styleIndex) < B_OK) {
             printf("MessageImporter::_ImportShapes() - "
-                   "Shape %ld doesn't reference a Style!", i);
+                   "Shape %" B_PRId32 " doesn't reference a Style!", i);
             continue;
         }
 #ifdef ICON_O_MATIC
@@ -192 +192 @@
 #endif
         if (!style) {
             printf("MessageImporter::_ImportShapes() - "
-                   "Shape %ld wants Style %ld, which does not exist\n",
+                   "Shape %" B_PRId32 " wants Style %" B_PRId32 ", which does not exist\n",
                 i, styleIndex);
             continue;
         }
@@ -218 +218 @@
 #endif
             if (!path) {
                 printf("MessageImporter::_ImportShapes() - "
-                       "Shape %ld referenced path %ld, "
+                       "Shape %" B_PRId32 " referenced path %" B_PRId32 ", "
                        "which does not exist\n", i, pathIndex);
                 continue;
             }

src/libs/icon/shape/VectorPath.cpp

@@ -976 +976 @@
 VectorPath::PrintToStream() const
 {
     for (int32 i = 0; i < fPointCount; i++) {
-        printf("point %ld: (%f, %f) -> (%f, %f) -> (%f, %f) (%d)\n", i,
+        printf("point %" B_PRId32 ": (%f, %f) -> (%f, %f) -> (%f, %f) (%d)\n", i,
             fPath[i].point_in.x, fPath[i].point_in.y,
             fPath[i].point.x, fPath[i].point.y,
             fPath[i].point_out.x, fPath[i].point_out.y, fPath[i].connected);
@@ -1085 +1085 @@
         // reallocation might have failed
         fPointCount = 0;
         fAllocCount = 0;
-        fprintf(stderr, "VectorPath::_SetPointCount(%ld) - allocation failed!\n",
+        fprintf(stderr, "VectorPath::_SetPointCount(%" B_PRId32 ") - allocation failed!\n",
             count);
     }
 

src/libs/icon/style/GradientTransformable.cpp

@@ -591 +591 @@
            string_for_interpolation(fInterpolation),
            fInheritTransformation);
     for (int32 i = 0; BGradient::ColorStop* step = ColorAt(i); i++) {
-        printf("  %ld: offset: %.1f -> color(%d, %d, %d, %d)\n",
+        printf("  %" B_PRId32 ": offset: %.1f -> color(%d, %d, %d, %d)\n",
                i, step->offset,
                step->color.red,
                step->color.green,

src/preferences/printers/JobListView.cpp

@@ -42 +42 @@
 JobListView::~JobListView()
 {
     while (!IsEmpty())
-        delete RemoveItem(0L);
+        delete RemoveItem((int32)0);
 }
 
 
@@ -61 +61 @@
 {
     // clear list
     while (!IsEmpty())
-        delete RemoveItem(0L);
+        delete RemoveItem((int32)0);
 
     if (folder == NULL)
         return;

src/preferences/printers/PrinterListView.cpp

@@ -45 +45 @@
 PrinterListView::~PrinterListView()
 {
     while (!IsEmpty())
-        delete RemoveItem(0L);
+        delete RemoveItem((int32)0);
 }
 
 
@@ -54 +54 @@
 {
     // clear list
     while (!IsEmpty())
-        delete RemoveItem(0L);
+        delete RemoveItem((int32)0);
 
     // Find directory containing printer definition nodes
     BPath path;

src/servers/cddb_daemon/cddb_daemon.cpp

@@ -84 +84 @@
     uint32 cddbId;
     if (!_CanLookup(device, &cddbId, toc)) {
         free(toc);
-        printf("Skipping device with id %ld.\n", device);
+        printf("Skipping device with id %" B_PRId32 ".\n", device);
         return B_BAD_TYPE;
     }
         
-    printf("Looking up CD with CDDB Id %08lx.\n", cddbId);
+    printf("Looking up CD with CDDB Id %08" B_PRId32 ".\n", cddbId);
 
     CDDBServer cddb_server("freedb.freedb.org:80");
 
@@ -123 +123 @@
     // Delete itens in the query response BList;
     int32 count = queryResponse.CountItems();
     for (int32 i = 0; i < count; ++i) {
-        delete (QueryResponseData*)queryResponse.RemoveItem(0L);
+        delete (QueryResponseData*)queryResponse.RemoveItem((int32)0);
     }
                         
     queryResponse.MakeEmpty();
@@ -131 +131 @@
     // Delete itens in the track data BList in the read response data;
     count = readResponse.tracks.CountItems();
     for (int32 i = 0; i < count; ++i) {
-        delete (TrackData*)readResponse.tracks.RemoveItem(0L);
+        delete (TrackData*)readResponse.tracks.RemoveItem((int32)0);
     }
                         
     readResponse.tracks.MakeEmpty();

src/servers/cddb_daemon/cddb_server.cpp

@@ -56 +56 @@
 
     // Convert CDDB id to hexadecimal format.
     char hexCddbId[9];
-    sprintf(hexCddbId, "%08lx", cddbId);
+    sprintf(hexCddbId, "%08" B_PRId32 "", cddbId);
     
     // Assemble the Query command.
     int32 numTracks = toc->last_track + 1 - toc->first_track;

src/servers/print/ConfigWindow.cpp

@@ -414 +414 @@
 {
     // clear menu
     while (menu->CountItems() != 0)
-        delete menu->RemoveItem(0L);
+        delete menu->RemoveItem((int32)0);
 
     // fill menu with printer names
     BAutolock lock(gLock);