Sophie

Sophie

distrib > Mandriva > 2010.1 > x86_64 > by-pkgid > f1855dca489cd55f65615b436583769a > files > 3

ekg2-1.0-0.20071213.4mdv2010.1.src.rpm

diff -up ekg2-0.2-rc1/ekg/strings.c.gcc43 ekg2-0.2-rc1/ekg/strings.c
--- ekg2-0.2-rc1/ekg/strings.c.gcc43	2008-02-28 21:23:03.000000000 +0100
+++ ekg2-0.2-rc1/ekg/strings.c	2008-06-04 10:55:10.000000000 +0200
@@ -43,36 +43,36 @@
 /* stringo-naprawiacz, taki jak ufix() w xmalloc */
 #define ufix(x)	((wchar_t *) x ? (wchar_t *) x : (wchar_t *) L"")
 
-inline int xwcslen(const CHAR_T *str) {
+int xwcslen(const CHAR_T *str) {
 	return wcslen(ufix(str));
 }
 
-inline int xmbslen(const char *str) {
+int xmbslen(const char *str) {
 	return mbstowcs(NULL, str ? str : "", 0);
 }
 
-inline CHAR_T *xwcscpy(CHAR_T *dst, CHAR_T *src) {
+CHAR_T *xwcscpy(CHAR_T *dst, CHAR_T *src) {
 	return wcscpy(ufix(dst), ufix(src));
 }
 
-inline CHAR_T *xwcsdup(CHAR_T *str) {
+CHAR_T *xwcsdup(CHAR_T *str) {
 	if (!str) return NULL;
 	return xmemdup(str, (xwcslen(str)+1) * sizeof(CHAR_T));
 }
 
-inline CHAR_T *xwcscat(CHAR_T *dst, const CHAR_T *src) {
+CHAR_T *xwcscat(CHAR_T *dst, const CHAR_T *src) {
 	return wcscat(ufix(dst), ufix(src));
 }
 
-inline int xwcscmp(const CHAR_T *s1, const CHAR_T *s2) {
+int xwcscmp(const CHAR_T *s1, const CHAR_T *s2) {
 	return wcscmp(ufix(s1), ufix(s2));
 }
 
-inline CHAR_T *xwcschr(const CHAR_T *s, CHAR_T c) {
+CHAR_T *xwcschr(const CHAR_T *s, CHAR_T c) {
 	return wcschr(ufix(s), c);
 }
 
-inline char *wcs_to_normal(const CHAR_T *str) {
+char *wcs_to_normal(const CHAR_T *str) {
 	if (!str) return NULL;
 	{
 		int len		= wcstombs(NULL, str,0);
@@ -85,7 +85,7 @@ inline char *wcs_to_normal(const CHAR_T 
 	}
 }
 
-inline CHAR_T *normal_to_wcs(const char *str) {
+CHAR_T *normal_to_wcs(const char *str) {
 	if (!str) return NULL;
 	{
 		int len = xmbslen(str)+1;
@@ -95,7 +95,7 @@ inline CHAR_T *normal_to_wcs(const char 
 	}
 }
 
-inline CHAR_T **wcs_array_make(const CHAR_T *string, const CHAR_T *sep, int max, int trim, int quotes) {
+CHAR_T **wcs_array_make(const CHAR_T *string, const CHAR_T *sep, int max, int trim, int quotes) {
 	char *str = wcs_to_normal(string);
 	char *sp  = wcs_to_normal(sep);
 	char **arr, **tmp;
@@ -115,7 +115,7 @@ inline CHAR_T **wcs_array_make(const CHA
 	return newarr;
 }
 
-inline size_t xwcslcpy(CHAR_T *dst, const CHAR_T *src, size_t size) {
+size_t xwcslcpy(CHAR_T *dst, const CHAR_T *src, size_t size) {
 	/* copied from strlcpy.c (c Piotr Domagalski) */
 	register size_t i, n = size;
 
@@ -131,7 +131,7 @@ inline size_t xwcslcpy(CHAR_T *dst, cons
 	return i;
 }
 
-inline CHAR_T *wcs_array_join(CHAR_T **array, const CHAR_T *sep) {
+CHAR_T *wcs_array_join(CHAR_T **array, const CHAR_T *sep) {
 	char **arr;
 	char *sp = wcs_to_normal(sep);
 	char *tmp;
diff -up ekg2-0.2-rc1/ekg/resolver.c.gcc43 ekg2-0.2-rc1/ekg/resolver.c
--- ekg2-0.2-rc1/ekg/resolver.c.gcc43	2008-02-28 21:23:03.000000000 +0100
+++ ekg2-0.2-rc1/ekg/resolver.c	2008-06-04 10:50:00.000000000 +0200
@@ -125,7 +125,7 @@ watch_t *ekg_resolver2(plugin_t *plugin,
 			if (!he)
 				a.s_addr = INADDR_NONE;
 			else
-				memcpy(&a, he->h_addr, sizeof(a));
+				memcpy(&a, he->h_addr_list[0], sizeof(a));
 		}
 		write(fd[1], &a, sizeof(a));
 		xfree(myserver);
diff -up ekg2-0.2-rc1/ekg/strings.h.gcc43 ekg2-0.2-rc1/ekg/strings.h
--- ekg2-0.2-rc1/ekg/strings.h.gcc43	2008-02-28 21:23:03.000000000 +0100
+++ ekg2-0.2-rc1/ekg/strings.h	2008-06-04 10:55:37.000000000 +0200
@@ -36,18 +36,18 @@ extern int config_use_unicode;	/* not ev
 #define STRING_FORMAT "%ls"
 #define CHAR_FORMAT "%lc"
 
-inline int xwcslen(const CHAR_T *str);
-inline int xmbslen(const char *str);
-inline CHAR_T *xwcscpy(CHAR_T *dst, CHAR_T *src);
-inline CHAR_T *xwcsdup(CHAR_T *str);
-inline CHAR_T *xwcscat(CHAR_T *dst, const CHAR_T *src);
-inline int xwcscmp(const CHAR_T *s1, const CHAR_T *s2);
-inline CHAR_T *xwcschr(const CHAR_T *s, CHAR_T c);
-inline char *wcs_to_normal(const CHAR_T *str);
-inline CHAR_T *normal_to_wcs(const char *str);
-inline CHAR_T **wcs_array_make(const CHAR_T *string, const CHAR_T *sep, int max, int trim, int quotes);
-inline CHAR_T *wcs_array_join(CHAR_T **array, const CHAR_T *sep);
-inline size_t xwcslcpy(CHAR_T *dst, const CHAR_T *src, size_t size);
+int xwcslen(const CHAR_T *str);
+int xmbslen(const char *str);
+CHAR_T *xwcscpy(CHAR_T *dst, CHAR_T *src);
+CHAR_T *xwcsdup(CHAR_T *str);
+CHAR_T *xwcscat(CHAR_T *dst, const CHAR_T *src);
+int xwcscmp(const CHAR_T *s1, const CHAR_T *s2);
+CHAR_T *xwcschr(const CHAR_T *s, CHAR_T c);
+char *wcs_to_normal(const CHAR_T *str);
+CHAR_T *normal_to_wcs(const char *str);
+CHAR_T **wcs_array_make(const CHAR_T *string, const CHAR_T *sep, int max, int trim, int quotes);
+CHAR_T *wcs_array_join(CHAR_T **array, const CHAR_T *sep);
+size_t xwcslcpy(CHAR_T *dst, const CHAR_T *src, size_t size);
 
 #define free_utf(x) xfree(x)
 
diff -up ekg2-0.2-rc1/plugins/jabber/Makefile.am.gcc43 ekg2-0.2-rc1/plugins/jabber/Makefile.am
--- ekg2-0.2-rc1/plugins/jabber/Makefile.am.gcc43	2008-02-28 21:22:56.000000000 +0100
+++ ekg2-0.2-rc1/plugins/jabber/Makefile.am	2008-06-04 10:50:00.000000000 +0200
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = jabber.la
 jabber_la_SOURCES = jabber.c commands.c misc.c digest.c xmlnode.c jabber_dcc.c jabber_handlers.c jabber.h jabber_dcc.h jabber-ssl.h
 jabber_la_LDFLAGS = -module -avoid-version
 jabber_la_LIBADD = $(EXPAT_LIBS) $(JABBER_SSL_LIBS) $(ZLIB_LIBS)
-jabber_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS) $(JABBER_SSL_CPPFLAGS)
+jabber_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS) $(JABBER_SSL_CPPFLAGS) -D_POSIX_SOURCE
 
 libdir = $(plugindir)
 
diff -up ekg2-0.2-rc1/plugins/feed/Makefile.am.gcc43 ekg2-0.2-rc1/plugins/feed/Makefile.am
--- ekg2-0.2-rc1/plugins/feed/Makefile.am.gcc43	2008-02-28 21:23:00.000000000 +0100
+++ ekg2-0.2-rc1/plugins/feed/Makefile.am	2008-06-04 10:50:00.000000000 +0200
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = feed.la
 feed_la_SOURCES = feed.c feed.h rss.c nntp.c
 feed_la_LDFLAGS = -module -avoid-version
 feed_la_LIBADD = $(EXPAT_LIBS)
-feed_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS)
+feed_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS) -D_POSIX_SOURCE
 
 libdir = $(plugindir)