[Gnash-commit] gnash macros/boost.m4 ChangeLog libbase/curl_ad...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/05/02 16:24:12

Modified files:
        macros         : boost.m4 
        .              : ChangeLog 
        libbase        : curl_adapter.cpp log.h network.cpp 
                         noseek_fd_adapter.cpp tu_timer.cpp tu_types.h 

Log message:
                * libbase/curl_adapter.cpp: Don't redefine snprintf() for win32.
                * libbase/noseek_fd_adapter.cpp: Don't redefine snprintf() for
                win32.
                * libbase/log.h: Include io.h for win32.
                * libbase/network.cpp: Use inet_ntoa() instead of the newer
                inet_ntop(). Include ws2tcpip.h for win32.
                * libbase/tu_timer.cpp: Use lowercase mmsystem.h.
                * libbase/tu_types.h: Don't use __FUNCDNAME__ to redefine
                __PRETTY_FUNCTION__for all win32 builds.
                * macros/boost.m4: Remove extraneous boost directory when
                searching for header files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3064&r2=1.3065
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/noseek_fd_adapter.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.h?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- macros/boost.m4     8 Apr 2007 23:06:17 -0000       1.37
+++ macros/boost.m4     2 May 2007 16:24:12 -0000       1.38
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: boost.m4,v 1.37 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: boost.m4,v 1.38 2007/05/02 16:24:12 rsavoye Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -49,7 +49,7 @@
     gnash_boost_version=""
     for i in $incllist; do
       for j in `ls -dr $i/boost* 2>/dev/null`; do
-        if test -f ${j}/boost/detail/lightweight_mutex.hpp; then
+        if test -f ${j}/detail/lightweight_mutex.hpp; then
           gnash_boost_topdir=`basename $j`
           gnash_boost_version=`echo ${gnash_boost_topdir} | sed -e 
's:boost-::'`
           ac_cv_path_boost_incl="-I$j"

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3064
retrieving revision 1.3065
diff -u -b -r1.3064 -r1.3065
--- ChangeLog   2 May 2007 14:18:05 -0000       1.3064
+++ ChangeLog   2 May 2007 16:24:12 -0000       1.3065
@@ -1,3 +1,17 @@
+2007-05-02  Rob Savoye  <address@hidden>
+
+       * libbase/curl_adapter.cpp: Don't redefine snprintf() for win32.
+       * libbase/noseek_fd_adapter.cpp: Don't redefine snprintf() for
+       win32.
+       * libbase/log.h: Include io.h for win32.
+       * libbase/network.cpp: Use inet_ntoa() instead of the newer
+       inet_ntop(). Include ws2tcpip.h for win32.
+       * libbase/tu_timer.cpp: Use lowercase mmsystem.h.
+       * libbase/tu_types.h: Don't use __FUNCDNAME__ to redefine
+       __PRETTY_FUNCTION__for all win32 builds.
+       * macros/boost.m4: Remove extraneous boost directory when
+       searching for header files.
+
 2007-05-02 Sandro Santilli <address@hidden>
 
        * libbase/curl_adapter.cpp (fill_cache): stop uselessly calling

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- libbase/curl_adapter.cpp    2 May 2007 13:37:15 -0000       1.29
+++ libbase/curl_adapter.cpp    2 May 2007 16:24:12 -0000       1.30
@@ -17,11 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: curl_adapter.cpp,v 1.29 2007/05/02 13:37:15 strk Exp $ */
-
-#if defined(_WIN32) || defined(WIN32)
-#define snprintf _snprintf
-#endif
+/* $Id: curl_adapter.cpp,v 1.30 2007/05/02 16:24:12 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- libbase/log.h       2 May 2007 07:34:34 -0000       1.48
+++ libbase/log.h       2 May 2007 16:24:12 -0000       1.49
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: log.h,v 1.48 2007/05/02 07:34:34 strk Exp $ */
+/* $Id: log.h,v 1.49 2007/05/02 16:24:12 rsavoye Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -23,6 +23,10 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_WINSOCK2_H
+# include <io.h>
+#endif
+
 // Support compilation with (or without) native language support
 #include "gettext.h"   // for internationalization (GNU gettext)
 #define        _(String) gettext (String)

Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- libbase/network.cpp 27 Apr 2007 07:49:36 -0000      1.25
+++ libbase/network.cpp 2 May 2007 16:24:12 -0000       1.26
@@ -35,6 +35,7 @@
 # include <windows.h>
 # include <sys/stat.h>
 # include <io.h>
+# include <ws2tcpip.h>
 #else
 # include <sys/time.h>
 # include <unistd.h>
@@ -187,8 +188,9 @@
         }
 
        if (_debug) {
-               char  ascip[INET_ADDRSTRLEN];
-               inet_ntop(sock_in.sin_family, &_ipaddr, ascip, INET_ADDRSTRLEN);
+//             char  ascip[INET_ADDRSTRLEN];
+//             inet_ntop(sock_in.sin_family, &_ipaddr, ascip, INET_ADDRSTRLEN);
+               char *ascip = ::inet_ntoa(sock_in.sin_addr);
            log_msg(_("Server bound to service on %s, port %hd, using fd %d"),
                    ascip, ntohs(sock_in.sin_port),
                    _listenfd);
@@ -424,8 +426,9 @@
         if (ret > 0) {
             ret = ::connect(_sockfd, reinterpret_cast<struct sockaddr 
*>(&sock_in), sizeof(sock_in));
             if (ret == 0) {
-               char ascip[INET_ADDRSTRLEN];
-               inet_ntop(sock_in.sin_family, &sock_in.sin_addr.s_addr, ascip, 
INET_ADDRSTRLEN);
+               char *ascip = ::inet_ntoa(sock_in.sin_addr);
+//             char ascip[INET_ADDRSTRLEN];
+//             inet_ntop(sock_in.sin_family, &sock_in.sin_addr.s_addr, ascip, 
INET_ADDRSTRLEN);
                 log_msg(_("\tport %d at IP %s for fd %d"), port,
                         ascip, _sockfd);
                 _connected = true;

Index: libbase/noseek_fd_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/noseek_fd_adapter.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/noseek_fd_adapter.cpp       17 Apr 2007 10:38:16 -0000      1.16
+++ libbase/noseek_fd_adapter.cpp       2 May 2007 16:24:12 -0000       1.17
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,13 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-
-/* $Id: noseek_fd_adapter.cpp,v 1.16 2007/04/17 10:38:16 strk Exp $ */
-
-#if defined(_WIN32) || defined(WIN32)
-#define snprintf _snprintf
-#endif
+/* $Id: noseek_fd_adapter.cpp,v 1.17 2007/05/02 16:24:12 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

Index: libbase/tu_timer.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/tu_timer.cpp        11 Apr 2007 17:54:21 -0000      1.6
+++ libbase/tu_timer.cpp        2 May 2007 16:24:12 -0000       1.7
@@ -12,7 +12,7 @@
 #if defined(_WIN32) || defined(WIN32)
 
 #include <windows.h>
-#include <Mmsystem.h>
+#include <mmsystem.h>
 
 
 uint64_t tu_timer::get_ticks()

Index: libbase/tu_types.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- libbase/tu_types.h  30 Apr 2007 17:27:39 -0000      1.35
+++ libbase/tu_types.h  2 May 2007 16:24:12 -0000       1.36
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: tu_types.h,v 1.35 2007/04/30 17:27:39 martinwguy Exp $ */
+/* $Id: tu_types.h,v 1.36 2007/05/02 16:24:12 rsavoye Exp $ */
 
 #ifndef TU_TYPES_H
 #define TU_TYPES_H
@@ -39,7 +39,6 @@
 typedef signed int int32_t;
 typedef unsigned __int64 uint64_t;
 typedef __int64 int64_t;
-# define __PRETTY_FUNCTION__ __FUNCDNAME__
 #else
 # include <inttypes.h>