incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1356837 - /incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx
Date Tue, 03 Jul 2012 17:10:56 GMT
Author: ydario
Date: Tue Jul  3 17:10:55 2012
New Revision: 1356837

URL: http://svn.apache.org/viewvc?rev=1356837&view=rev
Log:
i118923 - OS/2 port: enable again LIBSTRICTPATH, we are no longer using innowin for java support.

Modified:
    incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx

Modified: incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx?rev=1356837&r1=1356836&r2=1356837&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx (original)
+++ incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx Tue Jul  3 17:10:55
2012
@@ -64,13 +64,11 @@ int main( int argc, char* argv[])
  	sprintf( szLibpath, "\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%%BeginLIBPATH%%;",
   		szDrive, szDir, szDrive, szDir);
 	DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH);
+
 	// make sure we load DLL from our path only, so multiple instances/versions
 	// can be loaded.
-#if 0
-	// YD this feature is not compatible with innowin b20,
-	// java cannot load with this flag enabled
 	DosSetExtLIBPATH( (PCSZ)"T", LIBPATHSTRICT);
-#endif
+
 #if OSL_DEBUG_LEVEL > 0
 	rc = DosQueryExtLIBPATH( (PSZ)szLibpath, BEGIN_LIBPATH);
 	fprintf( stderr, "2 BeginLibPath: %s\n", szLibpath);



Mime
View raw message