diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdir_unix.cpp | 8 | ||||
| -rw-r--r-- | src/tools/qfileinfo_unix.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp index 5c0c393..c58741a 100644 --- a/src/tools/qdir_unix.cpp +++ b/src/tools/qdir_unix.cpp @@ -74,7 +74,7 @@ QString QDir::homeDirPath() QString QDir::canonicalPath() const { QString r; -#if defined(__GLIBC__) && !defined(PATH_MAX) +#if !defined(PATH_MAX) char *cur = ::get_current_dir_name(); if ( cur ) { char *tmp = canonicalize_file_name( QFile::encodeName( dPath ).data() ); @@ -103,7 +103,7 @@ QString QDir::canonicalPath() const // FIXME } } -#endif /* __GLIBC__ && !PATH_MAX */ +#endif /* !PATH_MAX */ return r; } @@ -165,7 +165,7 @@ QString QDir::currentDirPath() struct stat st; if ( ::stat( ".", &st ) == 0 ) { -#if defined(__GLIBC__) && !defined(PATH_MAX) +#if !defined(PATH_MAX) char *currentName = ::get_current_dir_name(); if ( currentName ) { result = QFile::decodeName(currentName); @@ -175,7 +175,7 @@ QString QDir::currentDirPath() char currentName[PATH_MAX+1]; if ( ::getcwd( currentName, PATH_MAX ) ) result = QFile::decodeName(currentName); -#endif /* __GLIBC__ && !PATH_MAX */ +#endif /* !PATH_MAX */ #if defined(QT_DEBUG) if ( result.isNull() ) qWarning( "QDir::currentDirPath: getcwd() failed" ); diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/qfileinfo_unix.cpp index cddb8f9..0ca0917 100644 --- a/src/tools/qfileinfo_unix.cpp +++ b/src/tools/qfileinfo_unix.cpp @@ -133,7 +133,7 @@ QString QFileInfo::readLink() const if ( !isSymLink() ) return QString(); #if defined(Q_OS_UNIX) && !defined(Q_OS_OS2EMX) -#if defined(__GLIBC__) && !defined(PATH_MAX) +#if !defined(PATH_MAX) int size = 256; char *s = NULL, *s2; @@ -165,7 +165,7 @@ QString QFileInfo::readLink() const s[len] = '\0'; return QFile::decodeName(s); } -#endif /* __GLIBC__ && !PATH_MAX */ +#endif /* !PATH_MAX */ #endif /* Q_OS_UNIX && !Q_OS_OS2EMX */ #if !defined(QWS) && defined(Q_OS_MAC) { |