[openocd-svn] Main OpenOCD repository branch, master, updated. 0.2.0-391-g620d7bb

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  620d7bb2b6fdcc86b645ec34cb1b348d4441ad34 (commit)
       via  550c44a800eaedc06405d3d611763830b567845d (commit)
      from  454c85a28a9c95c195602ff157f33c52e0a1049c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 620d7bb2b6fdcc86b645ec34cb1b348d4441ad34
Author: Redirect 'Slash' NIL <red...@gm...>
Date:   Mon Oct 19 17:55:40 2009 -0700

    MinGW: always use "-D__USE_MINGW_ANSI_STDIO"
    
    This is unfortunately needed to make stdio work like OpenOCD expects -- matching
    the ANSI-C standard, instead of MS-Windows.
    
    I tested it in both MinGW-W64 on Vista 64 and MinGW-W32 on XP, and I don't
    see any adverse effects to enabling it for all MinGW versions.

diff --git a/configure.in b/configure.in
index 8e2881c..1d3f0ec 100644
--- a/configure.in
+++ b/configure.in
@@ -481,6 +481,8 @@ case $host in
       AC_MSG_WARN([--disable-parport-giveio is not supported by MinGW32 hosts])
     fi
     parport_use_giveio=yes
+    
+    CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO"
 
     AC_DEFINE(IS_MINGW, 1, [1 if building for MinGW.])
     AC_DEFINE(IS_WIN32, 1, [1 if building for Win32.])

commit 550c44a800eaedc06405d3d611763830b567845d
Author: Redirect 'Slash' NIL <red...@gm...>
Date:   Mon Oct 19 17:48:19 2009 -0700

    MinGW: use WinSock2
    
    After reading a bit further, it appears that ws2_32 (Windows Sockets 2)
    is included in all versions of Windows and backwards compatible with
    wsock32, at least according to
    
     http://msdn.microsoft.com/en-us/library/ms740673%28VS.85%29.aspx.
    
    Only Win95 seems to require a manual installation; is not a big deal.
    
    So I think we can drop this whole business of detecting 64 bit MinGW and
    just use -lws2_32 for all MinGW platforms.

diff --git a/src/Makefile.am b/src/Makefile.am
index a223f95..6717910 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
 libopenocd_la_LDFLAGS = $(all_libraries)
 
 if IS_MINGW
-MINGWLDADD = -lwsock32
+MINGWLDADD = -lws2_32
 else
 MINGWLDADD =
 endif

-----------------------------------------------------------------------

Summary of changes:
 configure.in    |    2 ++
 src/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository