Mercurial > hg > xmms-sid
changeset 214:575686094eb1
Portability fixes
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 15 Dec 2004 11:02:02 +0000 |
| parents | 405b647cbd8d |
| children | 24e9907bd3e4 |
| files | src/xs_config.h src/xs_length.h src/xs_md5.c src/xs_md5.h src/xs_stil.c src/xs_stil.h src/xs_support.c src/xs_support.h |
| diffstat | 8 files changed, 39 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xs_config.h Wed Dec 15 11:00:05 2004 +0000 +++ b/src/xs_config.h Wed Dec 15 11:02:02 2004 +0000 @@ -1,12 +1,12 @@ #ifndef XS_CONFIG_H #define XS_CONFIG_H +#include "xmms-sid.h" + #ifdef __cplusplus extern "C" { #endif -#include "xmms-sid.h" - /* * Configuration structure */
--- a/src/xs_length.h Wed Dec 15 11:00:05 2004 +0000 +++ b/src/xs_length.h Wed Dec 15 11:02:02 2004 +0000 @@ -1,13 +1,13 @@ #ifndef XS_LENGTH_H #define XS_LENGTH_H +#include "xmms-sid.h" +#include "xs_md5.h" + #ifdef __cplusplus extern "C" { #endif -#include "xmms-sid.h" -#include "xs_md5.h" - /* * Defines and typedefs */
--- a/src/xs_md5.c Wed Dec 15 11:00:05 2004 +0000 +++ b/src/xs_md5.c Wed Dec 15 11:02:02 2004 +0000 @@ -36,11 +36,19 @@ 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5). 1999-05-03 lpd Original version. */ +/* Include config.h here, because we don't include xmms-sid.h */ #ifdef HAVE_CONFIG_H #include <config.h> #endif + #include <glib.h> +#ifdef HAVE_STRING_H #include <string.h> +#else +#ifdef HAVE_STRINGS_H +#include <strings.h> +#endif +#endif #include "xs_md5.h" #define T1 0xd76aa478
--- a/src/xs_md5.h Wed Dec 15 11:00:05 2004 +0000 +++ b/src/xs_md5.h Wed Dec 15 11:02:02 2004 +0000 @@ -1,12 +1,12 @@ #ifndef XS_MD5_H #define XS_MD5_H +#include <glib.h> + #ifdef __cplusplus extern "C" { #endif -#include <glib.h> - /* * Typedefs */
--- a/src/xs_stil.c Wed Dec 15 11:00:05 2004 +0000 +++ b/src/xs_stil.c Wed Dec 15 11:02:02 2004 +0000 @@ -22,10 +22,8 @@ #include "xs_stil.h" #include "xs_support.h" #include "xs_config.h" -#include <stdlib.h> #include <stdio.h> #include <ctype.h> -#include <string.h> /*
--- a/src/xs_stil.h Wed Dec 15 11:00:05 2004 +0000 +++ b/src/xs_stil.h Wed Dec 15 11:02:02 2004 +0000 @@ -1,12 +1,12 @@ #ifndef XS_STIL_H #define XS_STIL_H +#include "xmms-sid.h" + #ifdef __cplusplus extern "C" { #endif -#include "xmms-sid.h" - /* * Defines and typedefs */
--- a/src/xs_support.c Wed Dec 15 11:00:05 2004 +0000 +++ b/src/xs_support.c Wed Dec 15 11:02:02 2004 +0000 @@ -19,8 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include <string.h> +#include "xmms-sid.h" #include "xs_support.h" @@ -124,3 +123,16 @@ { while (pcStr[*piPos] && isdigit(pcStr[*piPos])) (*piPos)++; } + + +#ifndef HAVE_MEMSET +void *xs_memset(void *p, int c, size_t n) +{ + gchar *dp; + + dp = (gchar *) p; + while (n--) { *dp = (gchar) c; n--; } + + return p; +} +#endif
--- a/src/xs_support.h Wed Dec 15 11:00:05 2004 +0000 +++ b/src/xs_support.h Wed Dec 15 11:02:02 2004 +0000 @@ -18,6 +18,14 @@ inline void xs_findeol(gchar *, guint *); inline void xs_findnum(gchar *, guint *); +#ifdef HAVE_MEMSET +#define xs_memset memset +#else +void *xs_memset(void *, int, size_t); +#endif + +#ifdef + #ifdef __cplusplus } #endif