svn commit: r1415563 - in /avro/trunk: CHANGES.txt lang/c/src/avroappend.c lang/c/src/datafile.c

[brucem]

Author: brucem
Date: Fri Nov 30 09:52:33 2012
New Revision: 1415563

URL: http://svn.apache.org/viewvc?rev=1415563&view=rev
Log:
AVRO-1174. Fix Windows build. Contributed by Stefan Langer.

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/c/src/avroappend.c
    avro/trunk/lang/c/src/datafile.c

Modified: avro/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1415563&r1=1415562&r2=1415563&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Fri Nov 30 09:52:33 2012
@@ -85,6 +85,8 @@ Avro 1.7.3 (3 November 2012)
     AVRO-1163. C: Fix a memory leak in avro_fixed_private(). (Maxim
     Pugachev via brucem)
 
+    AVRO-1174. C: Fix Windows build. (Stefan Langer via brucem)
+
 Avro 1.7.2 (20 October 2012)
 
   NEW FEATURES

Modified: avro/trunk/lang/c/src/avroappend.c
URL: 
http://svn.apache.org/viewvc/avro/trunk/lang/c/src/avroappend.c?rev=1415563&r1=1415562&r2=1415563&view=diff
==============================================================================
--- avro/trunk/lang/c/src/avroappend.c (original)
+++ avro/trunk/lang/c/src/avroappend.c Fri Nov 30 09:52:33 2012
@@ -19,7 +19,9 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef _WIN32
 #include <unistd.h>
+#endif
 
 #include "avro.h"
 

Modified: avro/trunk/lang/c/src/datafile.c
URL: 
http://svn.apache.org/viewvc/avro/trunk/lang/c/src/datafile.c?rev=1415563&r1=1415562&r2=1415563&view=diff
==============================================================================
--- avro/trunk/lang/c/src/datafile.c (original)
+++ avro/trunk/lang/c/src/datafile.c Fri Nov 30 09:52:33 2012
@@ -373,7 +373,7 @@ file_writer_open(const char *path, avro_
        }
 
        w->datum_buffer_size = block_size;
-       w->datum_buffer = avro_malloc(w->datum_buffer_size);
+       w->datum_buffer = (char *) avro_malloc(w->datum_buffer_size);
 
        if(!w->datum_buffer) {
                avro_set_error("Could not allocate datum buffer\n");
@@ -407,7 +407,7 @@ avro_file_writer_open_bs(const char *pat
                avro_set_error("Cannot create new file writer for %s", path);
                return ENOMEM;
        }
-       w->codec = avro_new(struct avro_codec_t_);
+       w->codec = (avro_codec_t) avro_new(struct avro_codec_t_);
        if (!w->codec) {
                avro_set_error("Cannot allocate new codec");
                avro_freet(struct avro_file_writer_t_, w);