Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash/

[paraslash.git] / osx_write.c

diff --git a/osx_write.c b/osx_write.c
index 153ae3d656bdfff144f048e584430968dc8b3ea2..95a84f2a548cbe153cff31f1ae831ecb1cebae6a 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -52,6 +52,7 @@ struct osx_buffer {
        struct osx_buffer *next;
 };
 
+/** data specific to the osx writer */
 struct private_osx_write_data {
        /** the main control structure for audio data manipulation */
        AudioUnit audio_unit;
@@ -246,7 +247,7 @@ e0:
        return ret;
 }
 
-__malloc void *osx_write_parse_config(char *options)
+__malloc static void *osx_write_parse_config(const char *options)
 {
        struct osx_write_args_info *conf
                = para_calloc(sizeof(struct osx_write_args_info));