From 6c5ac69ac22a772c27398bf77961604195b63dfe Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Thu, 4 Dec 2003 21:00:27 +0000 Subject: [PATCH] Matching port type with stored attribut type. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5567 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../hp_jetdirect/HPJetDirectTransport.cpp | 2 +- .../print/transports/hp_jetdirect/Jamfile | 20 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.cpp b/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.cpp index 2e213db0ab..3baceb6f63 100644 --- a/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.cpp +++ b/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.cpp @@ -61,7 +61,7 @@ HPJetDirectPort::HPJetDirectPort(BDirectory* printer, BMessage *msg) } dir.ReadAttr("hp_jetdirect:host", B_STRING_TYPE, 0, fHost, sizeof(fHost)); - dir.ReadAttr("hp_jetdirect:port", B_INT16_TYPE, 0, &fPort, sizeof(fPort)); + dir.ReadAttr("hp_jetdirect:port", B_UINT16_TYPE, 0, &fPort, sizeof(fPort)); }; fEndpoint = new BNetEndpoint(SOCK_STREAM); diff --git a/src/add-ons/print/transports/hp_jetdirect/Jamfile b/src/add-ons/print/transports/hp_jetdirect/Jamfile index 80ebcc3d95..01d0657601 100644 --- a/src/add-ons/print/transports/hp_jetdirect/Jamfile +++ b/src/add-ons/print/transports/hp_jetdirect/Jamfile @@ -2,31 +2,11 @@ SubDir OBOS_TOP src add-ons print transports hp_jetdirect ; SubDirHdrs [ FDirName $(OBOS_TOP) src add-ons print transports shared ] ; -<<<<<<< Jamfile Addon HP\ JetDirect : print transport : print_transport.cpp HPJetDirectTransport.cpp SetupWindow.cpp -======= -UsePrivateHeaders net ; - -Addon LPR - : print transport - : Lpr.cpp - LprSetupDlg.cpp - LprTransport.cpp - LpsClient.cpp - Socket.o - SocketStream2.o - DbgMsg.o ->>>>>>> 1.4 ; # LinkSharedOSLibs HP\ JetDirect : be netapi ; # for net_server LinkSharedOSLibs HP\ JetDirect : be bnetapi ; # for BONE - -<<<<<<< Jamfile -======= -LinkSharedOSLibs LPR : be net stdc++.r4 ; ->>>>>>> 1.4 -