diff --git a/headers/private/print/PrintTransportAddOn.h b/headers/private/print/PrintTransportAddOn.h index 12430f54a5..fb93a50f8b 100644 --- a/headers/private/print/PrintTransportAddOn.h +++ b/headers/private/print/PrintTransportAddOn.h @@ -36,6 +36,6 @@ THE SOFTWARE. #include // to be implemented by the transport add-on -extern "C" BDataIO* instanciate_transport(BDirectory* printer, BMessage* msg); +extern "C" BDataIO* instantiate_transport(BDirectory* printer, BMessage* msg); #endif PRINT_TRANSPORT_ADD_ON_H diff --git a/src/add-ons/print/shared/PrintTransportAddOn.cpp b/src/add-ons/print/shared/PrintTransportAddOn.cpp index f1156b553a..9ab4efbaf1 100644 --- a/src/add-ons/print/shared/PrintTransportAddOn.cpp +++ b/src/add-ons/print/shared/PrintTransportAddOn.cpp @@ -14,7 +14,7 @@ extern "C" _EXPORT BDataIO *init_transport(BMessage *msg) BDirectory printer(spool_path); if (printer.InitCheck() == B_OK) { - gTransport = instanciate_transport(&printer, msg); + gTransport = instantiate_transport(&printer, msg); return gTransport; }; }; diff --git a/src/add-ons/print/transports/parallel_port/ParallelTransport.cpp b/src/add-ons/print/transports/parallel_port/ParallelTransport.cpp index 3db92df1d1..193cbcb689 100644 --- a/src/add-ons/print/transports/parallel_port/ParallelTransport.cpp +++ b/src/add-ons/print/transports/parallel_port/ParallelTransport.cpp @@ -99,7 +99,7 @@ ssize_t ParallelTransport::Write(const void* buffer, size_t size) return write(fFile, buffer, size); } -BDataIO* instanciate_transport(BDirectory* printer, BMessage* msg) +BDataIO* instantiate_transport(BDirectory* printer, BMessage* msg) { ParallelTransport* transport = new ParallelTransport(printer, msg); if (transport->InitCheck() == B_OK) diff --git a/src/add-ons/print/transports/serial_port/SerialTransport.cpp b/src/add-ons/print/transports/serial_port/SerialTransport.cpp index 5b4b432de1..503a5b522a 100644 --- a/src/add-ons/print/transports/serial_port/SerialTransport.cpp +++ b/src/add-ons/print/transports/serial_port/SerialTransport.cpp @@ -100,7 +100,7 @@ ssize_t SerialTransport::Write(const void* buffer, size_t size) return write(fFile, buffer, size); } -BDataIO* instanciate_transport(BDirectory* printer, BMessage* msg) +BDataIO* instantiate_transport(BDirectory* printer, BMessage* msg) { SerialTransport* transport = new SerialTransport(printer, msg); if (transport->InitCheck() == B_OK) diff --git a/src/add-ons/print/transports/shared/Jamfile b/src/add-ons/print/transports/shared/Jamfile index 341b41b16c..ad44d8a95a 100644 --- a/src/add-ons/print/transports/shared/Jamfile +++ b/src/add-ons/print/transports/shared/Jamfile @@ -2,7 +2,7 @@ SubDir OBOS_TOP src add-ons print transports shared ; SetupObjectsDir ; -ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET ; +ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -Dclosesocket=close ; Objects DbgMsg.cpp diff --git a/src/add-ons/print/transports/usb_port/USBTransport.cpp b/src/add-ons/print/transports/usb_port/USBTransport.cpp index 77b209617f..9dcd8dc293 100644 --- a/src/add-ons/print/transports/usb_port/USBTransport.cpp +++ b/src/add-ons/print/transports/usb_port/USBTransport.cpp @@ -65,7 +65,7 @@ private: // Implementation of transport add-on interface BDataIO * -instanciate_transport(BDirectory *printer, BMessage *msg) +instantiate_transport(BDirectory *printer, BMessage *msg) { USBTransport * transport = new USBTransport(printer, msg); if (transport->InitCheck() == B_OK)