# HG changeset patch
# User js
# Date 1158459206 25200
# Node ID 51eaea53b78c6e1ee22fd7808b756b4ea0a8c6ce
# Parent  b30feae3daeebad5cd1f921fa2ea1d35095a4204
[svn] #undef ALIGN, since it's already defined on OpenBSD.

diff -r b30feae3daee -r 51eaea53b78c ChangeLog
--- 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
diff -r b30feae3daee -r 51eaea53b78c Plugins/Input/wma/libffwma/utils.c
--- 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){