totem-pl-parser r33 - in trunk: . lib plparse

[hadess svn gnome org]

Author: hadess
Date: Wed Jan  9 12:03:13 2008
New Revision: 33
URL: http://svn.gnome.org/viewvc/totem-pl-parser?rev=33&view=rev

Log:
2008-01-09  Bastien Nocera  <hadess hadess net>

	* lib/memmem.c: The private function should be called
	totem_private_memmem, not memmem
	* plparse/Makefile.am: Link the mini library to the glibc
	replacement functions as well



Modified:
   trunk/ChangeLog
   trunk/lib/memmem.c
   trunk/plparse/Makefile.am

Modified: trunk/lib/memmem.c
==============================================================================
--- trunk/lib/memmem.c	(original)
+++ trunk/lib/memmem.c	Wed Jan  9 12:03:13 2008
@@ -50,7 +50,7 @@
  * Boyer R.S., Moore J.S. 1977, "A fast string searching algorithm",
  * Communications of ACM. 20:762-772.
  */
-void *memmem(s, slen, p, plen)
+void *totem_private_memmem(s, slen, p, plen)
 register const void *s, *p;
 size_t slen, plen;
 {

Modified: trunk/plparse/Makefile.am
==============================================================================
--- trunk/plparse/Makefile.am	(original)
+++ trunk/plparse/Makefile.am	Wed Jan  9 12:03:13 2008
@@ -155,8 +155,9 @@
 	$(WARN_CFLAGS)			\
 	$(AM_CFLAGS)
 
-libtotem_plparser_mini_la_LIBADD = \
-	$(TOTEM_PLPARSER_MINI_LIBS)
+libtotem_plparser_mini_la_LIBADD =		\
+	$(TOTEM_PLPARSER_MINI_LIBS)		\
+	$(top_builddir)/lib/libtotem_glibc.la
 
 libtotem_plparser_mini_la_LDFLAGS =			\
 	-version-info $(PLPARSER_LT_VERSION)		\