[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-123-
From: |
Giuseppe Scrivano |
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-123-gccc9532 |
Date: |
Fri, 09 Apr 2010 19:14:33 +0000 |
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 "GNU MyServer".
The branch, master has been updated
via ccc953230e78e1819e46eedc637e92ce5801a5a2 (commit)
via 0243d24be039550fd317dc63d79aadd4ec01802a (commit)
from 8427719da42f7c0df0dc56755f386f4c6cf829f8 (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 -----------------------------------------------------------------
commit ccc953230e78e1819e46eedc637e92ce5801a5a2
Author: Giuseppe Scrivano <address@hidden>
Date: Fri Apr 9 21:00:26 2010 +0200
Workaround a linker error when libintl redefines sprintf/snprintf
diff --git a/myserver/myserver.h b/myserver/myserver.h
index 5e1dbed..013c606 100644
--- a/myserver/myserver.h
+++ b/myserver/myserver.h
@@ -48,8 +48,15 @@ typedef void* HANDLE;
#endif
#ifdef HAVE_GETTEXT
+
+/*XXX: Fix me. */
+# undef sprintf
+# undef snprintf
+
# include <libintl.h>
+
# define _(X) gettext (X)
+
#else
# define _(X) X
#endif
commit 0243d24be039550fd317dc63d79aadd4ec01802a
Author: Giuseppe Scrivano <address@hidden>
Date: Fri Apr 9 19:39:32 2010 +0200
If the mscgi file is not created, return with success.
diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index b03fb68..fff3b1b 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -26,8 +26,7 @@ SO_EXT=`$(LIBTOOL) --config | $(SED) -e"y/'/\"/" -e
'/^shrext_cmds/ !d; s/^.*="\
all: all-am math_sum.mscgi
math_sum.mscgi: libmath_sum.la
- test -e .libs/libmath_sum$(SO_EXT) \
- || cp .libs/libmath_sum$(SO_EXT) ../../cgi-bin/math_sum.mscgi
+ test \! -e .libs/libmath_sum$(SO_EXT) || cp .libs/libmath_sum$(SO_EXT)
../../cgi-bin/math_sum.mscgi
clean-local:
test \! -e libmath_sum.la || \
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am
b/myserver/binaries/web/cgi-src/post/Makefile.am
index fe058b5..f435e8a 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -26,12 +26,11 @@ SO_EXT=`$(LIBTOOL) --config | $(SED) -e"y/'/\"/" -e
'/^shrext_cmds/ !d; s/^.*="\
all: all-am post.mscgi
post.mscgi: libpost.la
- test -e .libs/libpost$(SO_EXT)
- || cp .libs/libpost$(SO_EXT) ../../cgi-bin/post.mscgi
+ test \! -e .libs/libpost$(SO_EXT) || cp .libs/libpost$(SO_EXT)
../../cgi-bin/post.mscgi
clean-local:
- test \! -e libpost.la || \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall
libpost.la
+ test \! -e libpost.la
+ || $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall
libpost.la
.phony : post.mscgi
-----------------------------------------------------------------------
Summary of changes:
myserver/binaries/web/cgi-src/math_sum/Makefile.am | 3 +--
myserver/binaries/web/cgi-src/post/Makefile.am | 7 +++----
myserver/myserver.h | 7 +++++++
3 files changed, 11 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU MyServer
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-123-gccc9532,
Giuseppe Scrivano <=