[Gnash-commit] [SCM] Gnash branch, master, updated. a9bf8739358c0fc33ed178b71b21b93f730b54e6

[Rob Savoye]

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 "Gnash".

The branch, master has been updated
       via  a9bf8739358c0fc33ed178b71b21b93f730b54e6 (commit)
       via  639f4da74fe2fa5728fc440ae67de6fdb40faa53 (commit)
      from  f8cd0e5ab71d667fe26832b225f8beb56a34e325 (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=a9bf8739358c0fc33ed178b71b21b93f730b54e6


commit a9bf8739358c0fc33ed178b71b21b93f730b54e6
Merge: 639f4da f8cd0e5
Author: Rob Savoye <address@hidden>
Date:   Sun Jan 23 08:52:06 2011 -0700

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=639f4da74fe2fa5728fc440ae67de6fdb40faa53


commit 639f4da74fe2fa5728fc440ae67de6fdb40faa53
Author: Brad SMith <address@hidden>
Date:   Sun Jan 23 08:51:44 2011 -0700

    drop mysql/ from the include path for MySQL headers.

diff --git a/extensions/mysql/mysql_db.cpp b/extensions/mysql/mysql_db.cpp
index 80429c5..22263f8 100644
--- a/extensions/mysql/mysql_db.cpp
+++ b/extensions/mysql/mysql_db.cpp
@@ -24,8 +24,8 @@
 #include "mysql_db.h"
 
 #include "namedStrings.h"
-#include <mysql/errmsg.h>
-#include <mysql/mysql.h>
+#include <errmsg.h>
+#include <mysql.h>
 #include <vector>
 
 #include "log.h"
diff --git a/extensions/mysql/mysql_db.h b/extensions/mysql/mysql_db.h
index 3ca882f..03d601f 100644
--- a/extensions/mysql/mysql_db.h
+++ b/extensions/mysql/mysql_db.h
@@ -23,8 +23,8 @@
 #include "gnashconfig.h"
 #endif
 
-#include <mysql/errmsg.h>
-#include <mysql/mysql.h>
+#include <errmsg.h>
+#include <mysql.h>
 
 #include "as_value.h"
 #include "as_object.h"

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

Summary of changes:
 extensions/mysql/mysql_db.cpp |    4 ++--
 extensions/mysql/mysql_db.h   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Gnash