changeset 1726:51eaea53b78c trunk

[svn] #undef ALIGN, since it's already defined on OpenBSD.
author js
date Sat, 16 Sep 2006 19:13:26 -0700
parents b30feae3daee
children 9b529320119d
files ChangeLog Plugins/Input/wma/libffwma/utils.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Sep 16 19:10:07 2006 -0700
+++ b/ChangeLog	Sat Sep 16 19:13:26 2006 -0700
@@ -1,3 +1,11 @@
+2006-09-17 02:10:07 +0000  Jonathan Schleifer <js@h3c.de>
+  revision [2387]
+  Seems like someone did a fix for Linux' iconv like I did for BSD's in another file. Added an #ifdef here, too.
+
+  Changes:        Modified:
+  +4 -0           trunk/Plugins/Input/flac/plugin_common/charset.c  
+
+
 2006-09-17 01:58:23 +0000  Jonathan Schleifer <js@h3c.de>
   revision [2385]
   nenolod's fix for the soundcard.h check was incomplete, fixed
--- a/Plugins/Input/wma/libffwma/utils.c	Sat Sep 16 19:10:07 2006 -0700
+++ b/Plugins/Input/wma/libffwma/utils.c	Sat Sep 16 19:13:26 2006 -0700
@@ -116,6 +116,7 @@
 
 #define INTERNAL_BUFFER_SIZE 32
 
+#undef ALIGN
 #define ALIGN(x, a) (((x)+(a)-1)&~((a)-1))
 
 void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){