Windows: Fix possible crash when using longjmp and gcc 4.6

* With gcc-4.6 the option -fomit-frame-pointer is turned on per default
  even for the win32 target. This results in segfaults for any application
  using setjmp/longjmp and MSVCRT.dll on WinXP.
  See http://gcc.gnu.org/ml/gcc/2011-10/msg00351.html
* Issue reported by Lars Kanis

diff --git a/configure.ac b/configure.ac
index b305f68..b29b2bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,7 @@ case $host in
        AC_MSG_RESULT([Windows])
        backend="windows"
        threads="windows"
+       AM_CFLAGS="${AM_CFLAGS} -fno-omit-frame-pointer"
        ;;
 *-cygwin*)
        AC_MSG_RESULT([Cygwin (using Windows backend)])
@@ -212,7 +213,7 @@ AM_CONDITIONAL([HAVE_SIGACTION], [test "x$have_sigaction" = "xyes"])
 AC_CHECK_HEADERS([sys/time.h])
 AC_CHECK_FUNCS(gettimeofday)
 
-AM_CFLAGS="-std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags -Wshadow"
+AM_CFLAGS="${AM_CFLAGS} -std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags -Wshadow"
 
 AC_SUBST(VISIBILITY_CFLAGS)
 AC_SUBST(AM_CFLAGS)

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 3b30253..f4b4197 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10523
+#define LIBUSB_NANO 10524