[Pkg-owncloud-commits] [ocsync] 17/29: compile ocsync for FreeBSD.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository ocsync.

commit b5785588668a2347ccbe958d74bad34c87077fc9
Author: hefee <hefee at netzguerilla.net>
Date:   Wed Dec 11 14:31:05 2013 +0100

    compile ocsync for FreeBSD.
---
 src/std/c_private.h | 9 +++++++++
 src/std/c_string.c  | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/std/c_private.h b/src/std/c_private.h
index fb1313c..c1ef1a7 100644
--- a/src/std/c_private.h
+++ b/src/std/c_private.h
@@ -36,6 +36,8 @@
 #include <wchar.h>
 #endif
 
+#include <errno.h>
+
 #ifdef _WIN32
 #define EDQUOT 0
 #define ENODATA 0
@@ -55,8 +57,15 @@
 #define nlink_t int
 #define getuid() 0
 #define geteuid() 0
+#else
+#include <fcntl.h>
+#endif
+
+#ifndef ENODATA
+#define ENODATA EPIPE
 #endif
 
+
 #ifdef _WIN32
 typedef struct stat64 csync_stat_t;
 #define _FILE_OFFSET_BITS 64
diff --git a/src/std/c_string.c b/src/std/c_string.c
index 2a660c4..2c056a5 100644
--- a/src/std/c_string.c
+++ b/src/std/c_string.c
@@ -335,7 +335,7 @@ char* c_utf8_from_locale(const mbchar_t *wstr)
 #ifdef WITH_ICONV
   dst = c_iconv(wstr, iconv_from_native);
 #else
-  dst = wstr;
+  dst = (char*) wstr;
 #endif
 #endif
   return dst;
@@ -372,7 +372,7 @@ mbchar_t* c_utf8_to_locale(const char *str)
 #ifdef WITH_ICONV
   dst = c_iconv(str, iconv_to_native);
 #else
-  dst = str;
+  dst = (_TCHAR*) str;
 #endif
 #endif
   return dst;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/ocsync.git