summaryrefslogtreecommitdiff
path: root/odk/source/unoapploader
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-10-13 13:54:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2010-10-13 14:36:49 +0100
commitb09ac477d2ba4ceed63072d31a957cbf783cfcf2 (patch)
tree1dcd0edb45e1486489a13f437cb3dae8975d8dfd /odk/source/unoapploader
parenta1e79609418a961e384ce99e4f888fbe377dc77c (diff)
tweak this for AIX
Diffstat (limited to 'odk/source/unoapploader')
-rw-r--r--odk/source/unoapploader/unx/unoapploader.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c
index bec148f20b08..4eb9ba874c3b 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -81,8 +81,10 @@ int main( int argc, char *argv[] )
if ( path != NULL )
{
-#ifdef MACOSX
+#if defined(MACOSX)
static const char* ENVVARNAME = "DYLD_LIBRARY_PATH";
+#elif defined(AIX)
+ static const char* ENVVARNAME = "LIBPATH";
#else
static const char* ENVVARNAME = "LD_LIBRARY_PATH";
#endif
@@ -259,12 +261,15 @@ char* createCommandName( char* argv0 )
char* cmdname = NULL;
char* sep = NULL;
+#ifndef AIX
Dl_info dl_info;
+#endif
int pos;
/* get the executable file name from argv0 */
prgname = argv0;
+#ifndef AIX
/*
* if argv0 doesn't contain an absolute path name, try to get the absolute
* path name from dladdr; note that this only works for Solaris, not for
@@ -276,6 +281,7 @@ char* createCommandName( char* argv0 )
{
prgname = dl_info.dli_fname;
}
+#endif
/* prefix the executable file name by '_' */
if ( prgname != NULL )