diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-05 16:00:42 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-05 16:00:42 -0500 |
| commit | 03518d6339ad40346fdcf7ab4b66d8eb307a36a8 (patch) | |
| tree | 55f88ec42581d6d1484db0da8c7ae749d6cc5799 /tdeio | |
| parent | 7cd4adc908abf8c5e3b391c4a88f0514ba8468c4 (diff) | |
| parent | 3f5a4b419f7907ba61c6f63458e0413cccb74760 (diff) | |
| download | tdelibs-03518d6339ad40346fdcf7ab4b66d8eb307a36a8.tar.gz tdelibs-03518d6339ad40346fdcf7ab4b66d8eb307a36a8.zip | |
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeio')
| -rw-r--r-- | tdeio/tdeio/connection.cpp | 4 | ||||
| -rw-r--r-- | tdeio/tdeio/kurlcompletion.cpp | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tdeio/tdeio/connection.cpp b/tdeio/tdeio/connection.cpp index 119ab6a10..50427aecf 100644 --- a/tdeio/tdeio/connection.cpp +++ b/tdeio/tdeio/connection.cpp @@ -43,7 +43,11 @@ #include <kdebug.h> #include <tqsocketnotifier.h> +#if defined(__OpenBSD__) +#define __progname getprogname() +#else extern char *__progname; +#endif using namespace TDEIO; diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp index 72f91261d..9184e0d02 100644 --- a/tdeio/tdeio/kurlcompletion.cpp +++ b/tdeio/tdeio/kurlcompletion.cpp @@ -778,10 +778,15 @@ bool KURLCompletion::userCompletion(const MyURL &url, TQString *match) // Environment variables // +#if !defined(__OpenBSD__) extern char **environ; // Array of environment variables +#endif bool KURLCompletion::envCompletion(const MyURL &url, TQString *match) { +#if defined(__OpenBSD__) + return false; +#else if ( url.file().at(0) != '$' ) return false; @@ -816,6 +821,7 @@ bool KURLCompletion::envCompletion(const MyURL &url, TQString *match) *match = finished(); return true; +#endif } ////////////////////////////////////////////////// |