[Gnash-commit] gnash ChangeLog plugin/plugin.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/09/28 16:07:36

Modified files:
        .              : ChangeLog 
        plugin         : plugin.cpp 

Log message:
        Fixed warning on redefing MIN()/MAX().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.951&r2=1.952
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.57&r2=1.58

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.951
retrieving revision 1.952
diff -u -b -r1.951 -r1.952
--- ChangeLog   28 Sep 2006 15:30:00 -0000      1.951
+++ ChangeLog   28 Sep 2006 16:07:35 -0000      1.952
@@ -1,3 +1,8 @@
+2006-09-27 Markus Gothe <address@hidden>
+
+       * plugin/plugin.cpp: Fixed warning on redefing MIN()/MAX(). Added
+         Id:-tag.
+
 2006-09-28 Sandro Santilli  <address@hidden>
 
        * libbase/curl_adapter.cpp: set curl user agent (gnash-VERSION).

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- plugin/plugin.cpp   27 Sep 2006 12:59:35 -0000      1.57
+++ plugin/plugin.cpp   28 Sep 2006 16:07:36 -0000      1.58
@@ -35,14 +35,12 @@
 // 
 //
 
+/* $Id: plugin.cpp,v 1.58 2006/09/28 16:07:36 nihilus Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "plugin.h"
-#include "log.h"
-#include "tu_types.h"
-
 #define MIME_TYPES_HANDLED  "application/x-shockwave-flash"
 // The name must be this value to get flash movies that check the
 // plugin version to load.
@@ -63,6 +61,9 @@
 
 
 #include <sys/param.h>
+#include "plugin.h" //Fixes Warning on redef of MIN/MAX
+#include "log.h"
+#include "tu_types.h"
 #include <csignal>
 #include <unistd.h>
 #include <cstdio>