diff options
| author | Phil Mesnier <mesnierp@ociweb.com> | 2016-03-10 14:32:00 -0600 |
|---|---|---|
| committer | Phil Mesnier <mesnierp@ociweb.com> | 2016-03-10 14:32:00 -0600 |
| commit | 355b5ae287d6ee5a5b08aaf524d4b7788cab5271 (patch) | |
| tree | 14af7656172ba9f627355c3f344b2757d6ea78ca /ACE | |
| parent | dc4277f13ed607c048b97b53342880928ab8d4a2 (diff) | |
| parent | 121ffbda2fd8a0f9ddd3f6cfdeb48874890a15d2 (diff) | |
| download | ATCD-355b5ae287d6ee5a5b08aaf524d4b7788cab5271.tar.gz | |
Merge pull request #210 from pmesnier/master
Collection of commits to bring over features and fixes from OCI TAO
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/config-linux.h | 1 | ||||
| -rw-r--r-- | ACE/bin/PerlACE/Run_Test.pm | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h index a29d6e55844..eeb6c46e447 100644 --- a/ACE/ace/config-linux.h +++ b/ACE/ace/config-linux.h @@ -403,6 +403,7 @@ #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R #define ACE_HAS_REENTRANT_FUNCTIONS +#define ACE_HAS_MNTENT // To support UCLIBC #if defined (__UCLIBC__) diff --git a/ACE/bin/PerlACE/Run_Test.pm b/ACE/bin/PerlACE/Run_Test.pm index 3f22bc2a110..4ae912f28ea 100644 --- a/ACE/bin/PerlACE/Run_Test.pm +++ b/ACE/bin/PerlACE/Run_Test.pm @@ -77,7 +77,9 @@ $| = 1; sub LocalFile ($) { my $file = shift; - + if (File::Spec->file_name_is_absolute( $file )) { + return $file; + } my $newfile = getcwd () . '/' . $file; if ($^O eq "MSWin32") { |