[Gnash-commit] gnash ChangeLog configure.ac gui/Player.cpp lib...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/05/21 08:31:01

Modified files:
        .              : ChangeLog configure.ac 
        gui            : Player.cpp 
        libnet         : network.h 

Log message:
        * libnet/network.h: Ensure data types are defined before including
        netinet.h (for OpenBSD).
        * gui/Player.cpp: Make sure write() is defined (for OpenBSD).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6659&r2=1.6660
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.533&r2=1.534
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/network.h?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6659
retrieving revision 1.6660
diff -u -b -r1.6659 -r1.6660
--- ChangeLog   21 May 2008 07:26:07 -0000      1.6659
+++ ChangeLog   21 May 2008 08:31:00 -0000      1.6660
@@ -1,3 +1,9 @@
+2008-05-20 Brad Smith <address@hidden>
+
+       * libnet/network.h: Ensure data types are defined before including
+       netinet.h (for OpenBSD).
+       * gui/Player.cpp: Make sure write() is defined (for OpenBSD).
+
 2008-05-21 Zou Lunkai <address@hidden>
        
        * server/cxform.{h,cpp}: docs, minor cleanup.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -b -r1.533 -r1.534
--- configure.ac        19 May 2008 08:35:07 -0000      1.533
+++ configure.ac        21 May 2008 08:31:01 -0000      1.534
@@ -1775,12 +1775,18 @@
   if test x$build_fb = xyes; then
     AC_MSG_ERROR([Cairo renderer is not supported by FB gui. Use 
--enable-renderer=AGG]);
   fi
+<<<<<<< configure.ac
+dnl  if test x$build_fltk = xyes; then
+dnl    AC_MSG_ERROR([Cairo renderer is not supported by FLTK gui. Use 
--enable-renderer=AGG]);
+dnl  fi
+=======
   if test x$build_sdl = xyes; then
     AC_MSG_ERROR([Cairo renderer is not supported by SDL gui. Use 
--enable-renderer=AGG]);
   fi
   if test x$build_fltk = xyes; then
     AC_MSG_ERROR([Cairo renderer is not supported by FLTK gui. Use 
--enable-renderer=AGG]);
   fi
+>>>>>>> 1.533
   if test x$build_kde = xyes; then
     AC_MSG_ERROR([Cairo renderer is not supported by KDE gui. Use 
--enable-renderer=AGG]);
   fi

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- gui/Player.cpp      17 May 2008 09:33:31 -0000      1.110
+++ gui/Player.cpp      21 May 2008 08:31:01 -0000      1.111
@@ -47,6 +47,7 @@
 #include <iostream>
 #include <sstream>
 #include <iomanip>
+#include <unistd.h>
 
 using namespace gnash;
 

Index: libnet/network.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/network.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libnet/network.h    3 May 2008 18:44:08 -0000       1.3
+++ libnet/network.h    21 May 2008 08:31:01 -0000      1.4
@@ -23,6 +23,7 @@
 #endif
 
 #if !defined(HAVE_WINSOCK_H) || defined(__OS2__)
+# include <sys/types.h>
 # include <netinet/in.h>
 # include <arpa/inet.h>
 #else