mirror of
https://github.com/systemd/systemd.git
synced 2025-03-22 06:50:18 +03:00
[PATCH] udev use new libsysfs header file location
Use the new location of libsysfs header files.
This commit is contained in:
parent
a638109dfa
commit
0bad3406c1
@ -32,14 +32,8 @@
|
||||
#include <stdarg.h>
|
||||
#include <ctype.h>
|
||||
#include <sys/stat.h>
|
||||
#ifdef __KLIBC__
|
||||
/*
|
||||
* Assume built under udev with KLIBC
|
||||
*/
|
||||
#include <libsysfs.h>
|
||||
#else
|
||||
#include <sysfs/libsysfs.h>
|
||||
#endif
|
||||
|
||||
#include "scsi_id_version.h"
|
||||
#include "scsi_id.h"
|
||||
|
||||
|
@ -31,14 +31,8 @@
|
||||
#include <unistd.h>
|
||||
#include <syslog.h>
|
||||
#include <scsi/sg.h>
|
||||
#ifdef __KLIBC__
|
||||
/*
|
||||
* Assume built under udev with KLIBC
|
||||
*/
|
||||
#include <libsysfs.h>
|
||||
#else
|
||||
#include <sysfs/libsysfs.h>
|
||||
#endif
|
||||
|
||||
#include "scsi_id.h"
|
||||
#include "scsi.h"
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
#include "libsysfs.h"
|
||||
#include "sysfs/libsysfs.h"
|
||||
#include "sysfs.h"
|
||||
|
||||
static void sysfs_close_dev(void *dev)
|
||||
|
@ -20,7 +20,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
#include "libsysfs.h"
|
||||
#include "sysfs/libsysfs.h"
|
||||
#include "sysfs.h"
|
||||
|
||||
static void sysfs_close_cls_dev(void *dev)
|
||||
|
@ -20,7 +20,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
#include "libsysfs.h"
|
||||
#include "sysfs/libsysfs.h"
|
||||
#include "sysfs.h"
|
||||
|
||||
/**
|
||||
|
@ -20,7 +20,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
#include "libsysfs.h"
|
||||
#include "sysfs/libsysfs.h"
|
||||
#include "sysfs.h"
|
||||
|
||||
/**
|
||||
|
@ -20,7 +20,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
#include "libsysfs.h"
|
||||
#include "sysfs/libsysfs.h"
|
||||
#include "sysfs.h"
|
||||
|
||||
static void sysfs_close_driver_device(void *device)
|
||||
|
@ -20,7 +20,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
#include "libsysfs.h"
|
||||
#include "sysfs/libsysfs.h"
|
||||
#include "sysfs.h"
|
||||
#ifndef __KLIBC__
|
||||
#include <mntent.h>
|
||||
|
@ -32,13 +32,13 @@
|
||||
#include <time.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sysfs/libsysfs.h>
|
||||
|
||||
#include "list.h"
|
||||
#include "udev.h"
|
||||
#include "udev_version.h"
|
||||
#include "logging.h"
|
||||
#include "namedev.h"
|
||||
#include "libsysfs/libsysfs.h"
|
||||
#include "klibc_fixups.h"
|
||||
|
||||
static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
|
||||
|
@ -33,6 +33,7 @@
|
||||
#ifndef __KLIBC__
|
||||
#include <pwd.h>
|
||||
#endif
|
||||
#include <sysfs/libsysfs.h>
|
||||
|
||||
#include "udev.h"
|
||||
#include "udev_version.h"
|
||||
@ -40,7 +41,6 @@
|
||||
#include "logging.h"
|
||||
#include "namedev.h"
|
||||
#include "udevdb.h"
|
||||
#include "libsysfs/libsysfs.h"
|
||||
#include "klibc_fixups.h"
|
||||
|
||||
/*
|
||||
|
2
udev.c
2
udev.c
@ -26,6 +26,7 @@
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
#include <signal.h>
|
||||
#include <sysfs/libsysfs.h>
|
||||
|
||||
#include "udev.h"
|
||||
#include "udev_version.h"
|
||||
@ -33,7 +34,6 @@
|
||||
#include "logging.h"
|
||||
#include "namedev.h"
|
||||
#include "udevdb.h"
|
||||
#include "libsysfs/libsysfs.h"
|
||||
|
||||
/* global variables */
|
||||
char **main_argv;
|
||||
|
2
udev.h
2
udev.h
@ -23,7 +23,7 @@
|
||||
#ifndef UDEV_H
|
||||
#define UDEV_H
|
||||
|
||||
#include "libsysfs/libsysfs.h"
|
||||
#include <sysfs/libsysfs.h>
|
||||
#include <stddef.h>
|
||||
#include <sys/param.h>
|
||||
|
||||
|
@ -31,12 +31,12 @@
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
#include <sysfs/libsysfs.h>
|
||||
|
||||
#include "udev.h"
|
||||
#include "udev_version.h"
|
||||
#include "logging.h"
|
||||
#include "namedev.h"
|
||||
#include "libsysfs/libsysfs.h"
|
||||
|
||||
/* global variables */
|
||||
char sysfs_path[SYSFS_PATH_MAX];
|
||||
|
2
udevdb.c
2
udevdb.c
@ -32,6 +32,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <sysfs/libsysfs.h>
|
||||
|
||||
#include "udev_version.h"
|
||||
#include "udev.h"
|
||||
@ -39,7 +40,6 @@
|
||||
#include "namedev.h"
|
||||
#include "udevdb.h"
|
||||
#include "tdb/tdb.h"
|
||||
#include "libsysfs/libsysfs.h"
|
||||
|
||||
static TDB_CONTEXT *udevdb;
|
||||
|
||||
|
@ -26,12 +26,12 @@
|
||||
#include <stdarg.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <sysfs/libsysfs.h>
|
||||
|
||||
#include "udev.h"
|
||||
#include "udev_version.h"
|
||||
#include "logging.h"
|
||||
#include "udevdb.h"
|
||||
#include "libsysfs/libsysfs.h"
|
||||
|
||||
|
||||
# define SYSFS_VALUE_MAX 200
|
||||
|
@ -26,12 +26,12 @@
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
#include <signal.h>
|
||||
#include <sysfs/libsysfs.h>
|
||||
|
||||
#include "udev.h"
|
||||
#include "udev_version.h"
|
||||
#include "logging.h"
|
||||
#include "namedev.h"
|
||||
#include "libsysfs/libsysfs.h"
|
||||
|
||||
/* global variables */
|
||||
char **main_argv;
|
||||
|
Loading…
x
Reference in New Issue
Block a user