Use the new location of libsysfs header files.
#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"
#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"
* 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)
* 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)
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
#include "sysfs.h"
/**
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
#include "sysfs.h"
/**
* 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)
* 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>
#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);
#ifndef __KLIBC__
#include <pwd.h>
#endif
+#include <sysfs/libsysfs.h>
#include "udev.h"
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
#include "udevdb.h"
-#include "libsysfs/libsysfs.h"
#include "klibc_fixups.h"
/*
#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 "udevdb.h"
-#include "libsysfs/libsysfs.h"
/* global variables */
char **main_argv;
#ifndef UDEV_H
#define UDEV_H
-#include "libsysfs/libsysfs.h"
+#include <sysfs/libsysfs.h>
#include <stddef.h>
#include <sys/param.h>
#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];
#include <sys/stat.h>
#include <errno.h>
#include <signal.h>
+#include <sysfs/libsysfs.h>
#include "udev_version.h"
#include "udev.h"
#include "namedev.h"
#include "udevdb.h"
#include "tdb/tdb.h"
-#include "libsysfs/libsysfs.h"
static TDB_CONTEXT *udevdb;
#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
#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;