[PATCH] update udev extras/scsi_id to version 0.2

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 4acbb61391fbb3e58eb3a5b4f42266881c187707..01db4494810d15c78ead66bd37bd2e68670d6ba5 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -50,13 +50,6 @@
 extern int log_message (int level, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
 
-
-/* default filenames for the config and database files */
-#define UDEV_CONFIG_FILE               "udev.conf"
-#define UDEV_DB                                ".udev.tdb"
-#define UDEV_RULES_FILE                        "udev.rules"
-#define UDEV_PERMISSION_FILE           "udev.permissions"
-
 #define COMMENT_CHARACTER              '#'
 
 #define NAME_SIZE      100
@@ -92,11 +85,11 @@ extern void udev_init_config(void);
 extern char **main_argv;
 extern char **main_envp;
 extern char sysfs_path[SYSFS_PATH_MAX];
-extern char udev_config_dir[PATH_MAX];
 extern char udev_root[PATH_MAX];
 extern char udev_db_filename[PATH_MAX+NAME_MAX];
-extern char udev_permission_filename[PATH_MAX+NAME_MAX];
+extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
 extern char udev_config_filename[PATH_MAX+NAME_MAX];
 extern char udev_rules_filename[PATH_MAX+NAME_MAX];
+extern char default_mode_str[NAME_MAX];
 
 #endif