blob: 5d5e92ac3ffaf0b5de53c75ae238e29662b1b52f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From 3a9e0759c78e3ce788c446b1fc68efa9e84c900a Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10walls@gmail.com>
Date: Sat, 28 Jun 2014 08:48:56 +0800
Subject: [PATCH 06/24] cygwin uses cyg library prefix
---
libjava/include/posix.h | 6 ++++++
libjava/java/net/natVMURLConnection.cc | 4 ++++
2 files changed, 10 insertions(+)
diff --git a/libjava/include/posix.h b/libjava/include/posix.h
index 6bd560c..cbda784 100644
--- a/libjava/include/posix.h
+++ b/libjava/include/posix.h
@@ -42,11 +42,17 @@ details. */
#include <java/util/Properties.h>
// Prefix and suffix for shared libraries.
+#ifdef __CYGWIN__
+#define _Jv_platform_solib_prefix "cyg"
+#else
#define _Jv_platform_solib_prefix "lib"
+#endif
#if defined(__APPLE__) && defined(__MACH__)
#define _Jv_platform_solib_suffix ".dylib"
#elif defined(HPUX) && defined(HP_PA)
#define _Jv_platform_solib_suffix ".sl"
+#elif defined(__CYGWIN__)
+#define _Jv_platform_solib_suffix ".dll"
#else
#define _Jv_platform_solib_suffix ".so"
#endif
diff --git a/libjava/java/net/natVMURLConnection.cc b/libjava/java/net/natVMURLConnection.cc
index 0a30a21..810e045 100644
--- a/libjava/java/net/natVMURLConnection.cc
+++ b/libjava/java/net/natVMURLConnection.cc
@@ -32,7 +32,11 @@ void
java::net::VMURLConnection::init ()
{
#if defined (HAVE_MAGIC_T) && defined (HAVE_MAGIC_H) && defined (USE_LTDL)
+#ifdef __CYGWIN__
+ lt_dlhandle handle = lt_dlopenext ("cygmagic-1.dll");
+#else
lt_dlhandle handle = lt_dlopenext ("libmagic.so");
+#endif
if (!handle)
return;
--
2.1.1
|
