[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11521: drop extraneous semi-colons
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11521: drop extraneous semi-colons and commas. |
|
Date: |
Thu, 24 Sep 2009 10:32:22 -0600 |
|
User-agent: |
Bazaar (1.16.1) |
------------------------------------------------------------
revno: 11521
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2009-09-24 10:32:22 -0600
message:
drop extraneous semi-colons and commas.
modified:
configure.ac
doc/C/preformatted/gnash_ref.info.in
doc/C/preformatted/gnashref.html.in
doc/C/preformatted/gprocessor.1.in
libamf/element.cpp
libamf/element.h
libamf/flv.h
libbase/Makefile.am
libbase/tree.hh
libcore/asobj/flash/net/NetConnection_as.cpp
libcore/movie_root.h
libnet/cache.cpp
libnet/network.cpp
libnet/rtmp.h
libnet/rtmp_msg.cpp
=== modified file 'configure.ac'
--- a/configure.ac 2009-09-10 09:40:15 +0000
+++ b/configure.ac 2009-09-24 16:32:22 +0000
@@ -907,6 +907,7 @@
fi
ltmajor=`echo $ltver | cut -d '.' -f 1`
AC_MSG_RESULT([$ltver])
+AM_CONDITIONAL(LIBLTDL2, [test $ltmajor -eq 2])
if test $ltmajor -eq 1; then
AC_LIBLTDL_CONVENIENCE
AC_LIBTOOL_DLOPEN
@@ -926,8 +927,9 @@
AC_CONFIG_FILES([libltdl/Makefile])
fi
AC_PROG_LIBTOOL
-AM_CONDITIONAL(LIBLTDL2, [test $ltmajor -eq 2])
-AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
+
+dnl Don't ever install libltdl
+AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" = xyes)
AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
AC_C_CONST
=== modified file 'doc/C/preformatted/gnash_ref.info.in'
--- a/doc/C/preformatted/gnash_ref.info.in 2009-03-19 09:13:48 +0000
+++ b/doc/C/preformatted/gnash_ref.info.in 2009-09-24 16:32:22 +0000
@@ -1,4 +1,4 @@
-This is gnash_ref.info, produced by makeinfo version 4.11 from stdin.
+This is gnash_ref.info, produced by makeinfo version 4.13 from stdin.
START-INFO-DIR-ENTRY
* Gnash Reference Manual: (gnash_ref). [MISSING TEXT]
@@ -169,10 +169,10 @@
http://www.gnashdev.org/dev_snapshots
(http://www.gnashdev.org/dev_snapshots/).
- Gnash uses ffmpeg for codecs, so any file supported by Mplayer
+ Gnash uses FFmpeg for codecs, so any file supported by Mplayer
should work with Gnash. Gnash supports the loading of patent free
codecs like Ogg Vorbis or Theora from disk based files, while work is
-being done to support these codecs when embedded in a SWF file. Ffmpeg
+being done to support these codecs when embedded in a SWF file. FFmpeg
contains the codecs used by the current SWF defintion, FLV, VP6 (ON2),
H.263, H.264, and MP3.
@@ -499,7 +499,7 @@
Required allows package
you to is
use the required
- FFMPEG if you
+ FFmpeg if you
decoder would
with like to
Gstreamer. use
@@ -507,7 +507,7 @@
as a
video
handler.
-FFMPEG Possibly FFMPEG If you
`ffmpeg-dev'`ffmpeg-devel'`ffmpeg'
+FFmpeg Possibly FFmpeg If you
`ffmpeg-dev'`ffmpeg-devel'`ffmpeg'
Required is a would
video like
handler. video
@@ -534,7 +534,7 @@
without
Gstreamer
support,
- ffmpeg
+ FFmpeg
can be
used
directly.
@@ -985,7 +985,7 @@
in newer versions (summer 2005) of
libMesa.
`--enable-media=ffmpeg|gst|none' Select the specified media decoder
- and sound engine. FFMPEG uses the
+ and sound engine. FFmpeg uses the
SDL sound engine; GST uses its own.
`GST' is the default decoder. ?
[undisplayable block object] You
@@ -1703,8 +1703,8 @@
Libgnashmedia handles Gnash's audio and video capabilities, dealing
with streamed video and sound as well as decoding embedded media
frames. Besides the standard SWF formats FLV, MPEG4, Nellymoser, ADPCM,
-MP3 and RAW, Gnash can decode other formats supports by gstreamer or
-ffmpeg, including the free OGG container and free codecs.
+MP3 and RAW, Gnash can decode other formats supports by Gstreamer or
+FFmpeg, including the free OGG container and free codecs.
File: gnash_ref.info, Node: libgnashamf, Next: libgnashbackend, Prev:
libgnashmedia, Up: The Libraries
=== modified file 'doc/C/preformatted/gnashref.html.in'
--- a/doc/C/preformatted/gnashref.html.in 2009-03-19 08:36:28 +0000
+++ b/doc/C/preformatted/gnashref.html.in 2009-09-24 16:32:22 +0000
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html;
charset=ISO-8859-1"><title>Gnash Reference Manual</title><meta name="generator"
content="DocBook XSL Stylesheets V1.73.2"></head><body bgcolor="white"
text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book"
lang="en"><div class="titlepage"><div><div><h1 class="title"><a
name="index"></a>Gnash Reference Manual</h1></div><div><p class="releaseinfo">
+<html><head><meta http-equiv="Content-Type" content="text/html;
charset=ISO-8859-1"><title>Gnash Reference Manual</title><meta name="generator"
content="DocBook XSL Stylesheets V1.74.3"></head><body bgcolor="white"
text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book"
lang="en"><div class="titlepage"><div><div><h1 class="title"><a
name="index"></a>Gnash Reference Manual</h1></div><div><p class="releaseinfo">
This manual describes version 0.8.5 of Gnash.
</p></div><div><p class="copyright">Copyright ? 2005, 2006, 2007, 2008
Free Software Foundation</p></div><div><div class="legalnotice"><a
name="legalnotice"></a><p>
Permission is granted to copy, distribute and/or modify this document
@@ -78,11 +78,11 @@
at: <a class="ulink" href="http://www.gnashdev.org/dev_snapshots/";
target="_top">
http://www.gnashdev.org/dev_snapshots</a>.
</p><p>
- Gnash uses ffmpeg for codecs, so any file supported by Mplayer
+ Gnash uses FFmpeg for codecs, so any file supported by Mplayer
should work with Gnash. Gnash supports the loading of patent
free codecs like Ogg Vorbis or Theora from disk based files,
while work is being done to support these codecs when embedded
- in a SWF file. Ffmpeg contains the codecs used by the current
+ in a SWF file. FFmpeg contains the codecs used by the current
SWF defintion, FLV, VP6 (ON2), H.263, H.264, and MP3.
</p></div></div><div class="chapter" lang="en"><div
class="titlepage"><div><div><h2 class="title"><a
name="build"></a>Chapter?2.?Building from Source</h2></div></div></div><div
class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a
href="#building_overview">Overview</a></span></dt><dt><span class="sect1"><a
href="#gettingsource">Getting The Source</a></span></dt><dd><dl><dt><span
class="sect2"><a href="#sourcereleases">Releases</a></span></dt><dt><span
class="sect2"><a href="#sourcecvs">Bzr
Access</a></span></dt></dl></dd><dt><span class="sect1"><a
href="#dependencies">Code Dependencies</a></span></dt><dt><span
class="sect1"><a href="#testdep">Testing Dependencies</a></span></dt><dt><span
class="sect1"><a href="#docdepend">Documentation
Dependencies</a></span></dt><dt><span class="sect1"><a
href="#configure">Configuring Gnash</a></span></dt><dt><span class="sect1"><a
href="#compile">Compiling the Code</a></span></dt><dt><span class="sect1"><a
href="#processdoc">Creating the Documentation</a></span></dt><dt><span
class="sect1"><a href="#runtests">Running the
Tests</a></span></dt><dd><dl><dt><span class="sect2"><a href="#dejagnu">Using
DejaGnu</a></span></dt><dt><span class="sect2"><a href="#manually">Running The
Tests Manually</a></span></dt></dl></dd></dl></div><div class="sect1"
lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear:
both"><a name="building_overview"></a>Overview</h2></div></div></div><p>
The typical process of building from source will involve
@@ -255,19 +255,19 @@
If you would like video playback, you must
install one of the video handlers.
</td><td align="left"><code
class="filename">libgstreamer0.8-dev</code></td><td align="left"><code
class="filename">gstreamer-devel</code></td><td align="left"><code
class="filename">gstreamer-0.10</code></td></tr><tr><td
align="left">gst-ffmpeg</td><td align="left">Possibly Required</td><td
align="left">?</td><td align="left">
- gst-ffmpeg allows you to use the FFMPEG decoder
+ gst-ffmpeg allows you to use the FFmpeg decoder
with Gstreamer.
</td><td align="left">
This package is required if you would like to
use Gstreamer as a video handler.
- </td><td align="left"><code
class="filename">gstreamer0.8-ffmpeg-dev</code></td><td align="left"><code
class="filename">gstreamer-ffmpeg-devel</code></td><td align="left"><code
class="filename">gstreamer-ffmpeg</code></td></tr><tr><td
align="left">FFMPEG</td><td align="left">Possibly Required</td><td
align="left">?</td><td align="left">
- FFMPEG is a video handler.
+ </td><td align="left"><code
class="filename">gstreamer0.8-ffmpeg-dev</code></td><td align="left"><code
class="filename">gstreamer-ffmpeg-devel</code></td><td align="left"><code
class="filename">gstreamer-ffmpeg</code></td></tr><tr><td
align="left">FFmpeg</td><td align="left">Possibly Required</td><td
align="left">?</td><td align="left">
+ FFmpeg is a video handler.
</td><td align="left">
If you would like video playback, you must
install one of the video handlers. When using the
gstreamer-ffmpeg plugin, ffmpeg doesn't need to be
installed, as it's part of the plugin. For systems
- without Gstreamer support, ffmpeg can be used directly.
+ without Gstreamer support, FFmpeg can be used directly.
</td><td align="left"><code
class="filename">ffmpeg-dev</code></td><td align="left"><code
class="filename">ffmpeg-devel</code></td><td align="left"><code
class="filename">ffmpeg</code></td></tr><tr><td align="left">JPEG</td><td
align="left">Required</td><td align="left">?</td><td align="left">
<a class="ulink" href="http://www.ijg.org/"; target="_top">JPEG</a>
is a lossy image format which is heavily used for images.
@@ -548,7 +548,7 @@
fixed in newer versions (summer 2005) of libMesa.</td></tr><tr><td
align="left"><code class="option">--enable-media=ffmpeg|gst|none</code>
</td><td align="left"> <p>
Select the specified media decoder and sound engine.
- FFMPEG uses the SDL sound engine; GST uses its own.
+ FFmpeg uses the SDL sound engine; GST uses its own.
<code class="option">GST</code> is the default decoder.
</p>
<p>
@@ -1154,7 +1154,7 @@
dealing with streamed video and sound as well as decoding
embedded media frames. Besides the standard SWF formats
FLV, MPEG4, Nellymoser, ADPCM, MP3 and RAW, <span
class="application">Gnash</span> can
- decode other formats supports by gstreamer or ffmpeg,
+ decode other formats supports by Gstreamer or FFmpeg,
including the free OGG container and free codecs.
</p></div><div class="sect3" lang="en"><div
class="titlepage"><div><div><h4 class="title"><a
name="libgnashamf"></a>libgnashamf</h4></div></div></div><p>
AMF is the data format used internally by SWF files. This is
@@ -1898,7 +1898,7 @@
Note that you do NOT need access to the SWF source code in order
to implement a Movie tester for it. Some knowledge about the
expected behavior suffices.
- </p></div></div></div><div class="chapter" lang="en"><div
class="titlepage"><div><div><h2 class="title"><a
name="newclass"></a>Chapter?4.?Adding New ActionScript
Class</h2></div></div></div><div class="toc"><p><b>Table of
Contents</b></p><dl><dt><span class="sect1"><a
href="#prototype">Prototype</a></span></dt><dt><span class="sect1"><a
href="#declaration">Declaration</a></span></dt><dt><span class="sect1"><a
href="#instantiation">Instantiation</a></span></dt><dt><span class="sect1"><a
href="#methods">Methods</a></span></dt><dt><span class="sect1"><a
href="#properties">Dynamic Properties</a></span></dt><dt><span class="sect1"><a
href="#as_value">The <span class="emphasis"><em>as_value</em></span> Object
Type</a></span></dt><dd><dl><dt><span class="sect2"><a href="#data_types">Data
Types</a></span></dt><dt><span class="sect2"><a href="#is_methods">Determining
the Type</a></span></dt><dt><span class="sect2"><a href="#to_methods">Fetching
the Value</a></span></dt><dt><span class="sect2"><a href="#set_methods">Setting
the Value and Type</a></span></dt><dt><span class="sect2"><a
href="#further_as_value_reading">Further
Reading</a></span></dt></dl></dd><dt><span class="sect1"><a
href="#asobject">Object ActionScript Class</a></span></dt><dd><dl><dt><span
class="sect2"><a href="#objectmethods">The Methods of the
Class</a></span></dt><dt><span class="sect2"><a href="#objectprops">The
Properties of the Object Class</a></span></dt><dt><span class="sect2"><a
href="#objectconf">Object Class
Conformance</a></span></dt></dl></dd></dl></div><p>
+ </p></div></div></div><div class="chapter" lang="en"><div
class="titlepage"><div><div><h2 class="title"><a
name="newclass"></a>Chapter?4.?Adding New ActionScript
Class</h2></div></div></div><div class="toc"><p><b>Table of
Contents</b></p><dl><dt><span class="sect1"><a
href="#prototype">Prototype</a></span></dt><dt><span class="sect1"><a
href="#declaration">Declaration</a></span></dt><dt><span class="sect1"><a
href="#instantiation">Instantiation</a></span></dt><dt><span class="sect1"><a
href="#methods">Methods</a></span></dt><dt><span class="sect1"><a
href="#properties">Dynamic Properties</a></span></dt><dt><span class="sect1"><a
href="#as_value">The as_value Object Type</a></span></dt><dd><dl><dt><span
class="sect2"><a href="#data_types">Data Types</a></span></dt><dt><span
class="sect2"><a href="#is_methods">Determining the
Type</a></span></dt><dt><span class="sect2"><a href="#to_methods">Fetching the
Value</a></span></dt><dt><span class="sect2"><a href="#set_methods">Setting the
Value and Type</a></span></dt><dt><span class="sect2"><a
href="#further_as_value_reading">Further
Reading</a></span></dt></dl></dd><dt><span class="sect1"><a
href="#asobject">Object ActionScript Class</a></span></dt><dd><dl><dt><span
class="sect2"><a href="#objectmethods">The Methods of the
Class</a></span></dt><dt><span class="sect2"><a href="#objectprops">The
Properties of the Object Class</a></span></dt><dt><span class="sect2"><a
href="#objectconf">Object Class
Conformance</a></span></dt></dl></dd></dl></div><p>
In this document, the term 'ActionScript class' refers to the
C++ class which is instantiated by Gnash when some ActionScript
code instantiates a corresponding class. The C++ class
=== modified file 'doc/C/preformatted/gprocessor.1.in'
--- a/doc/C/preformatted/gprocessor.1.in 2008-06-23 04:34:05 +0000
+++ b/doc/C/preformatted/gprocessor.1.in 2009-09-24 16:32:22 +0000
@@ -1,11 +1,11 @@
-'\" -*- coding: us-ascii -*-
+.\" -*- coding: us-ascii -*-
.if \n(.g .ds T< \\FC
.if \n(.g .ds T> \\F[\n[.fam]]
.de URL
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH gprocessor 1 "20 June 2008" "" ""
+.TH gprocessor 1 "12 September 2009" "" ""
.SH NAME
gprocessor \- Gnash SWF Processor
.SH Synopsis
=== modified file 'libamf/element.cpp'
--- a/libamf/element.cpp 2009-08-26 02:58:29 +0000
+++ b/libamf/element.cpp 2009-09-24 16:32:22 +0000
@@ -234,7 +234,7 @@
return _buffer->size();
}
return 0;
-};
+}
/// \brief Cast the data in this Element to a double value.
///
@@ -292,7 +292,7 @@
return "NULL";
}
return 0;
-};
+}
/// \brief Cast the data in this Element to a boolean value.
///
@@ -305,7 +305,7 @@
return *(reinterpret_cast<bool *>(_buffer->reference()));
}
return false;
-};
+}
/// \brief Cast the data in this Element to an real pointer to data.
///
@@ -318,7 +318,7 @@
return _buffer->reference();
}
return 0;
-};
+}
const boost::uint8_t *
Element::to_reference() const
@@ -328,7 +328,7 @@
return _buffer->reference();
}
return 0;
-};
+}
/// \brief Test equivalance against another Element.
/// This compares all the data and the data type in the
@@ -397,7 +397,7 @@
*_buffer += x;
}
return false;
-};
+}
size_t
Element::calculateSize()
@@ -538,7 +538,7 @@
boost::shared_ptr<Element> el;
return el;
-};
+}
/// \brief Make this Element be the same as another Element.
///
=== modified file 'libamf/element.h'
--- a/libamf/element.h 2009-09-06 16:47:00 +0000
+++ b/libamf/element.h 2009-09-24 16:32:22 +0000
@@ -68,7 +68,7 @@
TYPED_OBJECT_AMF0 = 0x10,
AMF3_DATA = 0x11,
// // these aren't part of the AMF spec, they're used internally
- RTMP_HEADER = 0x20,
+ RTMP_HEADER = 0x20
// FUNCTION=0x12
} amf0_type_e;
@@ -90,7 +90,7 @@
ARRAY_AMF3 = 0x09,
OBJECT_AMF3 = 0x0a,
XML_AMF3 = 0x0b,
- BYTES_AMF3 = 0x0c,
+ BYTES_AMF3 = 0x0c
} amf3_type_e;
/// \brief Create a new Element with no data type.
=== modified file 'libamf/flv.h'
--- a/libamf/flv.h 2009-02-25 22:33:03 +0000
+++ b/libamf/flv.h 2009-09-24 16:32:22 +0000
@@ -83,7 +83,7 @@
AUDIO_55KHZ = 0x0,
AUDIO_11KHZ = 0x1,
AUDIO_22KHZ = 0x2,
- AUDIO_44KHZ = 0x3,
+ AUDIO_44KHZ = 0x3
} flv_sound_rate_e;
/// \enum Flv::flv_sound_format_e.
///
@@ -95,7 +95,7 @@
AUDIO_NELLYMOSER_8KHZ = 0x5,
AUDIO_NELLYMOSER = 0x6,
// These next are only supported by Gnash
- AUDIO_VORBIS = 0x7,
+ AUDIO_VORBIS = 0x7
} flv_sound_format_e;
// Video Tag types
@@ -112,7 +112,7 @@
VIDEO_SCREEN2 = 0x6,
VIDEO_THEORA = 0x7,
VIDEO_DIRAC = 0x8,
- VIDEO_SPEEX = 0x9,
+ VIDEO_SPEEX = 0x9
} flv_video_codec_e;
/// \enum Flv::flv_video_frame_e.
=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am 2009-07-01 09:29:34 +0000
+++ b/libbase/Makefile.am 2009-09-24 16:32:22 +0000
@@ -28,6 +28,17 @@
endif
endif
+if !LIBLTDL2
+libltdlc_la_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/libltdl
+if CONVENIENCE_LTDL
+noinst_LTLIBRARIES = libltdlc.la
+libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+endif
+
+libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
+libltdl_la_LIBADD = $(LIBADD_DL)
+
sysconf_DATA = gnashrc gnashpluginrc
edit = sed \
@@ -206,17 +217,6 @@
libgnashbase_la_LIBADD += -lws2_32 -lwinmm
endif
-if !LIBLTDL2
-libltdlc_la_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/libltdl
-if CONVENIENCE_LTDL
-noinst_LTLIBRARIES = libltdlc.la
-libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-endif
-
-libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
-libltdl_la_LIBADD = $(LIBADD_DL)
-
if WIN32
libltdl_la_LDFLAGS += -static
endif
=== modified file 'libbase/tree.hh'
--- a/libbase/tree.hh 2008-10-20 06:28:13 +0000
+++ b/libbase/tree.hh 2009-09-24 16:32:22 +0000
@@ -89,7 +89,7 @@
p->~T1();
}
-};
+}
/// A node in the tree, combining links to other nodes as well as the actual
data.
template<class T>
=== modified file 'libcore/asobj/flash/net/NetConnection_as.cpp'
--- a/libcore/asobj/flash/net/NetConnection_as.cpp 2009-08-27 10:35:23
+0000
+++ b/libcore/asobj/flash/net/NetConnection_as.cpp 2009-09-24 16:32:22
+0000
@@ -594,7 +594,7 @@
}
return true;
-};
+}
void
HTTPRemotingHandler::call(as_object* asCallback, const std::string& methodName,
=== modified file 'libcore/movie_root.h'
--- a/libcore/movie_root.h 2009-09-17 23:02:48 +0000
+++ b/libcore/movie_root.h 2009-09-24 16:32:22 +0000
@@ -511,7 +511,7 @@
enum StageHorizontalAlign {
STAGE_H_ALIGN_C,
STAGE_H_ALIGN_L,
- STAGE_H_ALIGN_R,
+ STAGE_H_ALIGN_R
};
/// The possible vertical position of the Stage
=== modified file 'libnet/cache.cpp'
--- a/libnet/cache.cpp 2009-02-25 22:33:03 +0000
+++ b/libnet/cache.cpp 2009-09-24 16:32:22 +0000
@@ -82,7 +82,7 @@
// GNASH_REPORT_FUNCTION;
boost::mutex::scoped_lock lock(cache_mutex);
_pathnames[name] = fullpath;
-};
+}
void
Cache::addResponse(const std::string &name, const std::string &response)
@@ -90,7 +90,7 @@
// GNASH_REPORT_FUNCTION;
boost::mutex::scoped_lock lock(cache_mutex);
_responses[name] = response;
-};
+}
void
Cache::addFile(const std::string &name, boost::shared_ptr<DiskStream> &file)
@@ -98,7 +98,7 @@
// GNASH_REPORT_FUNCTION;
boost::mutex::scoped_lock lock(cache_mutex);
_files[name] = file;
-};
+}
string &
Cache::findPath(const std::string &name)
@@ -115,7 +115,7 @@
}
#endif
return _pathnames[name];
-};
+}
string &
Cache::findResponse(const std::string &name)
@@ -132,7 +132,7 @@
}
#endif
return _responses[name];
-};
+}
boost::shared_ptr<DiskStream>
Cache::findFile(const std::string &name)
@@ -149,7 +149,7 @@
}
#endif
return _files[name];
-};
+}
void
Cache::removePath(const std::string &name)
=== modified file 'libnet/network.cpp'
--- a/libnet/network.cpp 2009-09-21 02:56:49 +0000
+++ b/libnet/network.cpp 2009-09-24 16:32:22 +0000
@@ -388,7 +388,7 @@
struct sockaddr_un {
sa_family_t sun_family; /* AF_UNIX */
char sun_path[UNIX_PATH_MAX]; /* pathname */
-};
+}
#endif /* _WIN32 */
@@ -978,14 +978,14 @@
{
// GNASH_REPORT_FUNCTION;
return writeNet(buffer->reference(), buffer->allocated());
-};
+}
int
Network::writeNet(int fd, amf::Buffer *buffer)
{
// GNASH_REPORT_FUNCTION;
return writeNet(fd, buffer->reference(), buffer->allocated());
-};
+}
// Write to the connection
int
@@ -993,7 +993,7 @@
{
// GNASH_REPORT_FUNCTION;
return writeNet(buffer.reference(), buffer.allocated());
-};
+}
// Write to the connection
int
@@ -1001,7 +1001,7 @@
{
// GNASH_REPORT_FUNCTION;
return writeNet(fd, buffer.reference(), buffer.allocated());
-};
+}
int
Network::writeNet(const std::string& data)
@@ -1201,7 +1201,7 @@
// GNASH_REPORT_FUNCTION;
boost::mutex::scoped_lock lock(_poll_mutex);
return &_pollfds[0];
-};
+}
void
Network::erasePollFD(int fd)
=== modified file 'libnet/rtmp.h'
--- a/libnet/rtmp.h 2009-09-09 20:56:22 +0000
+++ b/libnet/rtmp.h 2009-09-24 16:32:22 +0000
@@ -198,7 +198,7 @@
AMF3_INVOKE = 0x11,
NOTIFY = 0x12,
INVOKE = 0x14,
- FLV_DATA = 0x16,
+ FLV_DATA = 0x16
} content_types_e;
typedef enum {
STREAM_START = 0x0,
=== modified file 'libnet/rtmp_msg.cpp'
--- a/libnet/rtmp_msg.cpp 2009-09-07 00:29:51 +0000
+++ b/libnet/rtmp_msg.cpp 2009-09-24 16:32:22 +0000
@@ -175,7 +175,7 @@
boost::shared_ptr<amf::Element> el;
return el;
-};
+}
/// \brief Find the named property for this Object.
///
- [Gnash-commit] /srv/bzr/gnash/trunk r11521: drop extraneous semi-colons and commas.,
Rob Savoye <=