summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2009-08-03 18:51:31 +0200
committerGravatar Nikias Bassen2009-08-03 18:51:31 +0200
commit3441c7a73f138efaa6037746e69f060fc0c3796e (patch)
tree88fb7b97adf2b3e567806f16db6be18f3b435a84
parent50c536e4b97f0eb5e4991b97d86564ed2f1d0ebe (diff)
downloadusbmuxd-3441c7a73f138efaa6037746e69f060fc0c3796e.tar.gz
usbmuxd-3441c7a73f138efaa6037746e69f060fc0c3796e.tar.bz2
Revert "include config.h and defined ENABLE_HACKS"
This reverts commit 6fbd2a72122d6bcd70edbf599baa7465e3e9acb6.
-rw-r--r--configure.ac14
-rw-r--r--src/usbmux.c5
2 files changed, 0 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index 21b69e3..b277f73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,20 +18,6 @@ AC_PROG_INSTALL
PKG_CHECK_MODULES(libusb, libusb >= 0.1.12)
-# check for options
-AC_ARG_ENABLE([hacks],
- [AS_HELP_STRING([--disable-hacks],
- [disable hacks that provide workarounds for certain problems])],
- [enable_hacks=no],
- [enable_hacks=yes])
-if test "x$enable_hacks" = xyes; then
- AC_DEFINE(ENABLE_HACKS, 1, [Define if you want hacks enabled])
- echo "Note: hacks are enabled."
-else
- echo "Note: hacks are DISABLED."
-fi
-AM_CONDITIONAL(ENABLE_HACKS, test "x$enable_hacks" = xyes)
-
# Output files
AC_OUTPUT([
diff --git a/src/usbmux.c b/src/usbmux.c
index 37538da..2157e05 100644
--- a/src/usbmux.c
+++ b/src/usbmux.c
@@ -15,9 +15,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#include <stdint.h>
#include <stdarg.h>
#include <stdlib.h>
@@ -848,7 +845,6 @@ int usbmux_send(usbmux_client_t client, const char *data, uint32_t datalen,
uint32_t curlen = datalen;
uint32_t packetsize = blocksize;
-#ifdef ENABLE_HACKS
// BEGIN HACK
if ((blocksize % 128) == 0) {
int cutoff = 28;
@@ -890,7 +886,6 @@ int usbmux_send(usbmux_client_t client, const char *data, uint32_t datalen,
fullsendresult -= sizeof(usbmux_tcp_header);
}
// END HACK
-#endif
// Set the length
client->header->length = packetsize;