From f940ec3d9c409254071c5139ad9a5e7ac7e5cb6b Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Thu, 15 May 2008 12:27:20 +0000 Subject: [PATCH] Fix the GCC4 build the other way around. Remove the unnecessary forward declarations and make the functions static again. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25510 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/network/usb_ecm/Driver.cpp | 12 ++++++------ src/add-ons/kernel/drivers/network/usb_ecm/Driver.h | 7 ------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/Driver.cpp b/src/add-ons/kernel/drivers/network/usb_ecm/Driver.cpp index dd49ef14cd..4054013d77 100644 --- a/src/add-ons/kernel/drivers/network/usb_ecm/Driver.cpp +++ b/src/add-ons/kernel/drivers/network/usb_ecm/Driver.cpp @@ -162,7 +162,7 @@ uninit_driver() } -extern "C" status_t +static status_t usb_ecm_open(const char *name, uint32 flags, void **cookie) { TRACE("open(%s, %lu, %p)\n", name, flags, cookie); @@ -181,7 +181,7 @@ usb_ecm_open(const char *name, uint32 flags, void **cookie) } -extern "C" status_t +static status_t usb_ecm_read(void *cookie, off_t position, void *buffer, size_t *numBytes) { TRACE("read(%p, %Ld, %p, %lu)\n", cookie, position, buffer, *numBytes); @@ -190,7 +190,7 @@ usb_ecm_read(void *cookie, off_t position, void *buffer, size_t *numBytes) } -extern "C" status_t +static status_t usb_ecm_write(void *cookie, off_t position, const void *buffer, size_t *numBytes) { @@ -200,7 +200,7 @@ usb_ecm_write(void *cookie, off_t position, const void *buffer, } -extern "C" status_t +static status_t usb_ecm_control(void *cookie, uint32 op, void *buffer, size_t length) { TRACE("control(%p, %lu, %p, %lu)\n", cookie, op, buffer, length); @@ -209,7 +209,7 @@ usb_ecm_control(void *cookie, uint32 op, void *buffer, size_t length) } -extern "C" status_t +static status_t usb_ecm_close(void *cookie) { TRACE("close(%p)\n", cookie); @@ -218,7 +218,7 @@ usb_ecm_close(void *cookie) } -extern "C" status_t +static status_t usb_ecm_free(void *cookie) { TRACE("free(%p)\n", cookie); diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h b/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h index 6350f6ac93..f085950842 100644 --- a/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h +++ b/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h @@ -62,13 +62,6 @@ status_t usb_ecm_device_removed(void *cookie); status_t init_hardware(); void uninit_driver(); -status_t usb_ecm_open(const char *name, uint32 flags, void **cookie); -status_t usb_ecm_read(void *cookie, off_t position, void *buffer, size_t *numBytes); -status_t usb_ecm_write(void *cookie, off_t position, const void *buffer, size_t *numBytes); -status_t usb_ecm_control(void *cookie, uint32 op, void *buffer, size_t length); -status_t usb_ecm_close(void *cookie); -status_t usb_ecm_free(void *cookie); - const char **publish_devices(); device_hooks *find_device(const char *name); }