summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2002-09-04 17:35:05 +0000
committerTor Lillqvist <tml@src.gnome.org>2002-09-04 17:35:05 +0000
commitd29a3e5bc932f3083c307b3ee9d8ef96028191da (patch)
tree5ac1b6149d12c750d22a5d29ee581311a0cd9008
parentd3e9e99a9b61f1b093aa9200b41eba55894865cc (diff)
downloadpango-d29a3e5bc932f3083c307b3ee9d8ef96028191da.tar.gz
G_WIN32_DLLMAIN_FOR_DLL_NAME not needed on Cygwin, surround with #ifdef
2002-09-04 Tor Lillqvist <tml@iki.fi> * pango/pango-utils.c: G_WIN32_DLLMAIN_FOR_DLL_NAME not needed on Cygwin, surround with #ifdef G_OS_WIN32. (91785, Masahiro Sakai)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-25
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/pango-utils.c4
7 files changed, 33 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 28526af6..bebdceaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-04 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pango-utils.c: G_WIN32_DLLMAIN_FOR_DLL_NAME not needed on
+ Cygwin, surround with #ifdef G_OS_WIN32. (91785, Masahiro Sakai)
+
Wed Aug 28 15:22:14 2002 Eric Mader <mader@jtcsv.com>
* pango/modules/indic/indic-ot.h:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 28526af6..bebdceaa 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2002-09-04 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pango-utils.c: G_WIN32_DLLMAIN_FOR_DLL_NAME not needed on
+ Cygwin, surround with #ifdef G_OS_WIN32. (91785, Masahiro Sakai)
+
Wed Aug 28 15:22:14 2002 Eric Mader <mader@jtcsv.com>
* pango/modules/indic/indic-ot.h:
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 28526af6..bebdceaa 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+2002-09-04 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pango-utils.c: G_WIN32_DLLMAIN_FOR_DLL_NAME not needed on
+ Cygwin, surround with #ifdef G_OS_WIN32. (91785, Masahiro Sakai)
+
Wed Aug 28 15:22:14 2002 Eric Mader <mader@jtcsv.com>
* pango/modules/indic/indic-ot.h:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 28526af6..bebdceaa 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+2002-09-04 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pango-utils.c: G_WIN32_DLLMAIN_FOR_DLL_NAME not needed on
+ Cygwin, surround with #ifdef G_OS_WIN32. (91785, Masahiro Sakai)
+
Wed Aug 28 15:22:14 2002 Eric Mader <mader@jtcsv.com>
* pango/modules/indic/indic-ot.h:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 28526af6..bebdceaa 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2002-09-04 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pango-utils.c: G_WIN32_DLLMAIN_FOR_DLL_NAME not needed on
+ Cygwin, surround with #ifdef G_OS_WIN32. (91785, Masahiro Sakai)
+
Wed Aug 28 15:22:14 2002 Eric Mader <mader@jtcsv.com>
* pango/modules/indic/indic-ot.h:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 28526af6..bebdceaa 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2002-09-04 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pango-utils.c: G_WIN32_DLLMAIN_FOR_DLL_NAME not needed on
+ Cygwin, surround with #ifdef G_OS_WIN32. (91785, Masahiro Sakai)
+
Wed Aug 28 15:22:14 2002 Eric Mader <mader@jtcsv.com>
* pango/modules/indic/indic-ot.h:
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 051ed8ad..1d6c4c6a 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -635,10 +635,12 @@ pango_config_key_get (const char *key)
return g_strdup (g_hash_table_lookup (config_hash, key));
}
+#ifdef G_OS_WIN32
+
/* DllMain function needed to tuck away the DLL name */
G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
-
+#endif
/**
* pango_get_sysconf_subdirectory: