Changeset View
Changeset View
Standalone View
Standalone View
net-mgmt/seafile/files/patch-daemon_vc-utils.c
--- daemon/vc-utils.c.orig 2015-01-28 02:24:19.000000000 -0500 | --- daemon/vc-utils.c.orig 2015-09-21 03:42:11 UTC | ||||
+++ daemon/vc-utils.c 2015-01-28 02:30:05.000000000 -0500 | +++ daemon/vc-utils.c | ||||
@@ -664,7 +664,7 @@ | @@ -664,7 +664,7 @@ error: | ||||
#endif /* defined WIN32 || defined __APPLE__ */ | #endif /* defined WIN32 || defined __APPLE__ */ | ||||
-#ifdef __linux__ | -#ifdef __linux__ | ||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) | +#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) | ||||
char * | char * | ||||
build_checkout_path (const char *worktree, const char *ce_name, int len) | build_checkout_path (const char *worktree, const char *ce_name, int len) | ||||
@@ -724,13 +724,13 @@ | @@ -724,13 +724,13 @@ checkout_entry (struct cache_entry *ce, | ||||
gboolean force_conflict = FALSE; | gboolean force_conflict = FALSE; | ||||
path_in = g_build_path ("/", o->base, ce->name, NULL); | path_in = g_build_path ("/", o->base, ce->name, NULL); | ||||
-#ifndef __linux__ | -#ifndef __linux__ | ||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) | +#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) | ||||
+ path = build_checkout_path (o->base, ce->name, ce_namelen(ce)); | + path = build_checkout_path (o->base, ce->name, ce_namelen(ce)); | ||||
+#else | +#else | ||||
path = build_case_conflict_free_path (o->base, ce->name, | path = build_case_conflict_free_path (o->base, ce->name, | ||||
conflict_hash, no_conflict_hash, | conflict_hash, no_conflict_hash, | ||||
&case_conflict, | &case_conflict, | ||||
FALSE); | FALSE); | ||||
-#else | -#else | ||||
- path = build_checkout_path (o->base, ce->name, ce_namelen(ce)); | - path = build_checkout_path (o->base, ce->name, ce_namelen(ce)); | ||||
#endif | #endif | ||||
g_free (path_in); | g_free (path_in); |