Mercurial > audlegacy-plugins
changeset 2464:590ab274e759
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 27 Mar 2008 04:15:28 +0200 |
| parents | 0c2b8d901d47 (diff) 85e03a981a7c (current diff) |
| children | 2df887365f92 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/modplug/stddefs.h Thu Mar 27 00:13:29 2008 +0900 +++ b/src/modplug/stddefs.h Thu Mar 27 04:15:28 2008 +0200 @@ -3,12 +3,7 @@ * * This source code is public domain. */ - -// stddefs.h: Standard defs to streamline coding style. -// -////////////////////////////////////////////////////////////////////// - -#if !defined(__MODPLUGXMMS_STDDEFS_H__INCLUDED__) +#ifndef __MODPLUGXMMS_STDDEFS_H__INCLUDED__ #define __MODPLUGXMMS_STDDEFS_H__INCLUDED__ #include <glib.h> @@ -16,16 +11,12 @@ #define MODPLUG_CFGID "modplug" #define MODPLUG_CONVERT(X) g_convert(X, -1, "UTF-8", "CP850", NULL, NULL, NULL) -//Invalid pointer +// Invalid pointer #ifndef NULL #define NULL 0 #endif -//Standard types. ---------------------------------------- -//These data types are provided because the standard types vary across -// platforms. For example, long is 64-bit on some 64-bit systems. -//u = unsigned -//# = size in bits +// Standard types typedef guchar uchar; typedef gint8 int8; @@ -42,4 +33,4 @@ typedef double float64; typedef long double float128; -#endif // included +#endif
--- a/src/sid/xs_about.c Thu Mar 27 00:13:29 2008 +0900 +++ b/src/sid/xs_about.c Thu Mar 27 04:15:28 2008 +0200 @@ -162,6 +162,7 @@ "\n" "(C) Copyright 1999-2007\n" "\tTecnic Software productions (TNSP)\n" + "\tLicensed under GNU GPL v2\n" "\n" "Programming and design\n" "\tMatti 'ccr' Hämäläinen\n"