[Trousers-scm] [GIT] Trousers master branch updated. TROUSERS_0_3_12-6-g7d20723

[Richard Maciel]

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

The branch, master has been updated
via 7d207231355a5702cbdcf24628e8c1e2e3722593 (commit)
from 48ed8431dd97ca7048db0c915499c27c8d47a4e8 (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://trousers.git.sourceforge.net/git/gitweb.cgi?p=trousers/trousers;a=commitdiff;h=7d207231355a5702cbdcf24628e8c1e2e3722593

commit 7d207231355a5702cbdcf24628e8c1e2e3722593
Author: Richard Maciel <***@linux.vnet.ibm.com>
Date: Mon Mar 3 13:38:29 2014 -0300

Remove references to my_init

Patch submitted by Nikos Mavrogiannopoulos (using sourceforge bugzilla)
to make the my_init function static because it was causing conflicts with
MySQL.

diff --git a/src/tspi/rpc/hosttable.c b/src/tspi/rpc/hosttable.c
index 7b70260..41e7da2 100644
--- a/src/tspi/rpc/hosttable.c
+++ b/src/tspi/rpc/hosttable.c
@@ -39,7 +39,7 @@ host_table_init()
#pragma init(_init)
void _init(void)
#else
-void __attribute__ ((constructor)) my_init(void)
+static void __attribute__ ((constructor)) my_init(void)
#endif
{
host_table_init();
@@ -73,7 +73,7 @@ host_table_final()
#pragma fini(_fini)
void _fini(void)
#else
-void __attribute__ ((destructor)) my_fini(void)
+static void __attribute__ ((destructor)) my_fini(void)
#endif
{
host_table_final();

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

Summary of changes:
src/tspi/rpc/hosttable.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive