lkml.org 
[lkml]   [2011]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/22] staging: usbip: userspace: usbip_common.h: fixup header includes
    Date
    Remove unnecessary headers from the file, and add the now missing
    headers into the files that actually need them.

    Signed-off-by: matt mooney <mfm@muteddisk.com>
    ---
    .../staging/usbip/userspace/libsrc/stub_driver.c | 2 ++
    .../staging/usbip/userspace/libsrc/usbip_common.h | 18 ++++++++----------
    drivers/staging/usbip/userspace/src/utils.c | 1 +
    3 files changed, 11 insertions(+), 10 deletions(-)

    diff --git a/drivers/staging/usbip/userspace/libsrc/stub_driver.c b/drivers/staging/usbip/userspace/libsrc/stub_driver.c
    index 4d4d171..6a1272d 100644
    --- a/drivers/staging/usbip/userspace/libsrc/stub_driver.c
    +++ b/drivers/staging/usbip/userspace/libsrc/stub_driver.c
    @@ -4,6 +4,8 @@

    #include <sys/types.h>
    #include <sys/stat.h>
    +
    +#include <errno.h>
    #include <unistd.h>

    #include "usbip.h"
    diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
    index 7dadb21..eedefbd 100644
    --- a/drivers/staging/usbip/userspace/libsrc/usbip_common.h
    +++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
    @@ -2,20 +2,18 @@
    * Copyright (C) 2005-2007 Takahiro Hirofuchi
    */

    -#ifndef _USBIP_COMMON_H
    -#define _USBIP_COMMON_H
    +#ifndef __USBIP_COMMON_H
    +#define __USBIP_COMMON_H
    +
    +#include <sysfs/libsysfs.h>

    -#include <unistd.h>
    #include <stdint.h>
    -#include <syslog.h>
    -#include <errno.h>
    #include <stdio.h>
    -#include <string.h>
    #include <stdlib.h>
    +#include <string.h>

    -#include <sysfs/libsysfs.h>
    -#include <netdb.h>
    -#include <sys/socket.h>
    +#include <syslog.h>
    +#include <unistd.h>

    #ifndef USBIDS_FILE
    #define USBIDS_FILE "/usr/share/hwdata/usb.ids"
    @@ -146,4 +144,4 @@ void usbip_names_free(void);
    void usbip_names_get_product(char *buff, size_t size, uint16_t vendor, uint16_t product);
    void usbip_names_get_class(char *buff, size_t size, uint8_t class, uint8_t subclass, uint8_t protocol);

    -#endif
    +#endif /* __USBIP_COMMON_H */
    diff --git a/drivers/staging/usbip/userspace/src/utils.c b/drivers/staging/usbip/userspace/src/utils.c
    index 1da1109..2a25cec 100644
    --- a/drivers/staging/usbip/userspace/src/utils.c
    +++ b/drivers/staging/usbip/userspace/src/utils.c
    @@ -6,6 +6,7 @@
    #include <sysfs/libsysfs.h>

    #include <limits.h>
    +#include <errno.h>
    #include <stdio.h>
    #include <string.h>

    --
    1.7.5.2


    \
     
     \ /
      Last update: 2011-06-20 08:05    [W:0.027 / U:148.644 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site