< prev index next >

src/jdk.jdwp.agent/share/native/libjdwp/transport.c

Print this page
rev 12879 : 8136556: Add the ability to perform static builds of MacOSX x64 binaries
Reviewed-by: ihse, bdelsart, gadams, lfoltan, rriggs, hseigel, twisti

*** 1,7 **** /* ! * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this
*** 99,111 **** /* Load transport library (directory=="" means do system search) */ static void * loadTransportLibrary(const char *libdir, const char *name) { void *handle; char libname[MAXPATHLEN+2]; - char buf[MAXPATHLEN*2+100]; const char *plibdir; /* Convert libdir from UTF-8 to platform encoding */ plibdir = NULL; if ( libdir != NULL ) { --- 99,112 ---- /* Load transport library (directory=="" means do system search) */ static void * loadTransportLibrary(const char *libdir, const char *name) { + char buf[MAXPATHLEN*2+100]; + #ifndef STATIC_BUILD void *handle; char libname[MAXPATHLEN+2]; const char *plibdir; /* Convert libdir from UTF-8 to platform encoding */ plibdir = NULL; if ( libdir != NULL ) {
*** 123,132 **** --- 124,136 ---- } /* dlopen (unix) / LoadLibrary (windows) the transport library */ handle = dbgsysLoadLibrary(libname, buf, sizeof(buf)); return handle; + #else + return (dbgsysLoadLibrary(NULL, buf, sizeof(buf))); + #endif } /* * loadTransport() is adapted from loadJVMHelperLib() in * JDK 1.2 javai.c v1.61
< prev index next >