logging.h   logging.h 
skipping to change at line 41 skipping to change at line 41
#define logging_close(foo) do { } while (0) #define logging_close(foo) do { } while (0)
#ifdef USE_LOG #ifdef USE_LOG
#include <stdarg.h> #include <stdarg.h>
#include <unistd.h> #include <unistd.h>
#include <syslog.h> #include <syslog.h>
#undef err #undef err
#define err(format, arg...) \ #define err(format, arg...) \
do { \ do { \
log_message(LOG_ERR ,"%s: " format ,__FILE__ ,## arg); \ log_message(LOG_ERR ,"%s: " format ,__FUNCTION__ ,## arg); \
} while (0) } while (0)
#undef info #undef info
#define info(format, arg...) \ #define info(format, arg...) \
do { \ do { \
log_message(LOG_INFO ,"%s: " format ,__FILE__ ,## arg); \ log_message(LOG_INFO ,"%s: " format ,__FUNCTION__ ,## arg); \
} while (0) } while (0)
#ifdef DEBUG #ifdef DEBUG
#undef dbg #undef dbg
#define dbg(format, arg...) \ #define dbg(format, arg...) \
do { \ do { \
log_message(LOG_DEBUG ,"%s: " format ,__FUNCTION__ ,## arg); \ log_message(LOG_DEBUG ,"%s: " format ,__FUNCTION__ ,## arg); \
} while (0) } while (0)
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 udev_libc_wrapper.h   udev_libc_wrapper.h 
skipping to change at line 25 skipping to change at line 25
* *
* You should have received a copy of the GNU General Public License al ong * You should have received a copy of the GNU General Public License al ong
* with this program; if not, write to the Free Software Foundation, In c., * with this program; if not, write to the Free Software Foundation, In c.,
* 675 Mass Ave, Cambridge, MA 02139, USA. * 675 Mass Ave, Cambridge, MA 02139, USA.
* *
*/ */
#ifndef _UDEV_LIBC_WRAPPER_H_ #ifndef _UDEV_LIBC_WRAPPER_H_
#define _UDEV_LIBC_WRAPPER_H_ #define _UDEV_LIBC_WRAPPER_H_
#include <string.h>
#include <unistd.h>
#include <linux/types.h>
/* needed for our signal handlers to work */
#undef asmlinkage #undef asmlinkage
#ifdef __i386__ #ifdef __i386__
#define asmlinkage __attribute__((regparm(0))) #define asmlinkage __attribute__((regparm(0)))
#else #else
#define asmlinkage #define asmlinkage
#endif #endif
/* headers are broken on some lazy platforms */
#ifndef __FD_SET #ifndef __FD_SET
#define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
#endif #endif
#ifndef __FD_CLR #ifndef __FD_CLR
#define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
#endif #endif
#ifndef __FD_ISSET #ifndef __FD_ISSET
#define __FD_ISSET(d, set) (((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0) #define __FD_ISSET(d, set) (((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0)
#endif #endif
#ifndef __FD_ZERO #ifndef __FD_ZERO
#define __FD_ZERO(set) ((void) memset ((void*) (set), 0, sizeof (fd_set))) #define __FD_ZERO(set) ((void) memset ((void*) (set), 0, sizeof (fd_set)))
#endif #endif
/* missing in some lazy distros */
#ifndef NETLINK_KOBJECT_UEVENT #ifndef NETLINK_KOBJECT_UEVENT
#define NETLINK_KOBJECT_UEVENT 15 #define NETLINK_KOBJECT_UEVENT 15
#endif #endif
#include <string.h>
#ifdef __KLIBC__ #ifdef __KLIBC__
static inline int clearenv(void) static inline int clearenv(void)
{ {
environ[0] = NULL; environ[0] = NULL;
return 0; return 0;
} }
#endif #endif
extern uid_t lookup_user(const char *user); extern uid_t lookup_user(const char *user);
extern gid_t lookup_group(const char *group); extern gid_t lookup_group(const char *group);
 End of changes. 4 change blocks. 
2 lines changed or deleted 7 lines changed or added


 udev_version.h   udev_version.h 
#define UDEV_VERSION "067" #define UDEV_VERSION "068"
#define UDEV_ROOT "/dev" #define UDEV_ROOT "/dev"
#define UDEV_DB "/dev/.udevdb" #define UDEV_DB "/dev/.udevdb"
#define UDEV_CONFIG_DIR "/etc/udev" #define UDEV_CONFIG_DIR "/etc/udev"
#define UDEV_CONFIG_FILE "/etc/udev/udev.conf" #define UDEV_CONFIG_FILE "/etc/udev/udev.conf"
#define UDEV_RULES_FILE "/etc/udev/rules.d" #define UDEV_RULES_FILE "/etc/udev/rules.d"
#define UDEV_BIN "/sbin/udev" #define UDEV_BIN "/sbin/udev"
#define UDEVD_BIN "/sbin/udevd" #define UDEVD_BIN "/sbin/udevd"
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/