[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Patch] - Fix compilation of direct_uri-test.c on OS/2

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Mon, 28 Jun 2010 09:47:52 +0100

On Sun, 2010-06-27, Paul Smedley wrote:
> [[[
> Fix compilation of direct_uri-test.c on OS/2
>
> * subversion/tests/libsvn_subr/dirent_uri-test.c : add define of getdcwd
> as _getdcwd for __OS2__ as well as _MSC_VER
> ]]]

Hi Paul. To see if there were other similar places, I searched for
_MSC_VER and found two more. Can you confirm whether the following is a
good patch?

[[[
Fix compilation of direct_uri-test.c on OS/2.

* subversion/tests/libsvn_subr/dirent_uri-test.c,
  subversion/tests/libsvn_subr/target-test.c,
  subversion/tests/svn_test_fs.c
  Define getdcwd as _getdcwd for __OS2__ as well as for _MSC_VER.
]]]

[[[
Index: subversion/tests/libsvn_subr/dirent_uri-test.c
===================================================================
--- subversion/tests/libsvn_subr/dirent_uri-test.c (revision 958494)
+++ subversion/tests/libsvn_subr/dirent_uri-test.c (working copy)
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__OS2__)
 #include <direct.h>
 #define getcwd _getcwd
 #define getdcwd _getdcwd
Index: subversion/tests/libsvn_subr/target-test.c
===================================================================
--- subversion/tests/libsvn_subr/target-test.c (revision 958494)
+++ subversion/tests/libsvn_subr/target-test.c (working copy)
@@ -24,7 +24,7 @@
 #include <apr_general.h>
 
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__OS2__)
 #include <direct.h>
 #define getcwd _getcwd
 #else
Index: subversion/tests/svn_test_fs.c
===================================================================
--- subversion/tests/svn_test_fs.c (revision 958494)
+++ subversion/tests/svn_test_fs.c (working copy)
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <apr_pools.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__OS2__)
 #include <direct.h>
 #define getcwd _getcwd
 #else
]]]

- Julian
Received on 2010-06-28 10:49:38 CEST

This is an archived mail posted to the Subversion Dev mailing list.