From 0298ca83a53d4d1866c614a584b97c33cbd578c4 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 23 Jan 2010 23:03:09 +0000
Subject: [PATCH] Drop redundant #ifdef protection as the Makefile already has
 conditional logic

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1724 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 urjtag/ChangeLog                | 4 ++++
 urjtag/src/tap/parport/direct.c | 4 ----
 urjtag/src/tap/parport/ppdev.c  | 4 ----
 urjtag/src/tap/parport/ppi.c    | 4 ----
 urjtag/src/tap/usbconn/libusb.c | 4 ----
 5 files changed, 4 insertions(+), 16 deletions(-)

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  <vapier@gentoo.org>
 
   * 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 <sysdep.h>
 
-#ifdef ENABLE_LOWLEVEL_DIRECT
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -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 <sysdep.h>
 
-#ifdef ENABLE_LOWLEVEL_PPDEV
-
 #include <stdio.h>
 #include <fcntl.h>
 #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 <sysdep.h>
 
-#ifdef HAVE_DEV_PPBUS_PPI_H
-
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -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 <sysdep.h>
 
-#ifdef HAVE_LIBUSB
-
 #include <fcntl.h>
 #if __CYGWIN__ || __MINGW32__
 #include <windows.h>
@@ -264,5 +262,3 @@ const urj_usbconn_driver_t urj_tap_usbconn_libusb_driver = {
     NULL,
     NULL
 };
-
-#endif /* HAVE_LIBUSB */