diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index a023d99d..040e8f90 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -90,6 +90,10 @@ * include/urjtag/usbconn.h (usbconn_connect, usbconn_free): Punt prototypes for funcs that do not exist and lack proper namespace prefix. + * src/tap/parport/direct.c, src/tap/parport/ppdev.c, src/tap/parport/ppi.c, + src/tap/usbconn/libusb.c: Drop redundant #ifdef protection as the Makefile + already has conditional logic. + 2010-01-22 Mike Frysinger * src/cmd/cmd_bit.c (cmd_bit_print_params): Fix strncat length handling. diff --git a/urjtag/src/tap/parport/direct.c b/urjtag/src/tap/parport/direct.c index a245fdbb..10bea4d6 100644 --- a/urjtag/src/tap/parport/direct.c +++ b/urjtag/src/tap/parport/direct.c @@ -26,8 +26,6 @@ #include -#ifdef ENABLE_LOWLEVEL_DIRECT - #include #include #include @@ -316,5 +314,3 @@ const urj_parport_driver_t urj_tap_parport_direct_parport_driver = { direct_get_status, direct_set_control }; - -#endif /* ENABLE_LOWLEVEL_DIRECT */ diff --git a/urjtag/src/tap/parport/ppdev.c b/urjtag/src/tap/parport/ppdev.c index b08a4f8c..eb61be27 100644 --- a/urjtag/src/tap/parport/ppdev.c +++ b/urjtag/src/tap/parport/ppdev.c @@ -25,8 +25,6 @@ #include -#ifdef ENABLE_LOWLEVEL_PPDEV - #include #include #ifdef HAVE_STROPTS_H @@ -252,5 +250,3 @@ const urj_parport_driver_t urj_tap_parport_ppdev_parport_driver = { ppdev_get_status, ppdev_set_control }; - -#endif /* ENABLE_LOWLEVEL_PPDEV */ diff --git a/urjtag/src/tap/parport/ppi.c b/urjtag/src/tap/parport/ppi.c index 1f799b06..1477431b 100644 --- a/urjtag/src/tap/parport/ppi.c +++ b/urjtag/src/tap/parport/ppi.c @@ -25,8 +25,6 @@ #include -#ifdef HAVE_DEV_PPBUS_PPI_H - #include #include #include @@ -238,5 +236,3 @@ const urj_parport_driver_t urj_tap_parport_ppi_parport_driver = { ppi_get_status, ppi_set_control }; - -#endif /* HAVE_DEV_PPBUS_PPI_H */ diff --git a/urjtag/src/tap/usbconn/libusb.c b/urjtag/src/tap/usbconn/libusb.c index e4bb1d6d..d4131cf5 100644 --- a/urjtag/src/tap/usbconn/libusb.c +++ b/urjtag/src/tap/usbconn/libusb.c @@ -26,8 +26,6 @@ #include -#ifdef HAVE_LIBUSB - #include #if __CYGWIN__ || __MINGW32__ #include @@ -264,5 +262,3 @@ const urj_usbconn_driver_t urj_tap_usbconn_libusb_driver = { NULL, NULL }; - -#endif /* HAVE_LIBUSB */