diff options
| author | Tor Lillqvist <tml@iki.fi> | 2002-09-04 17:33:56 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2002-09-04 17:33:56 +0000 |
| commit | d07a3d5fb64bef2af4ceb86bbc7cdef25aedd9ba (patch) | |
| tree | c8d1f09d25936fb6b6c25bf4841c0e8847111063 | |
| parent | af9a19ce7acddb6855227cb679b157ac1a1c0583 (diff) | |
| download | pango-d07a3d5fb64bef2af4ceb86bbc7cdef25aedd9ba.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-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/pango-utils.c | 4 |
7 files changed, 33 insertions, 1 deletions
@@ -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) + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 209d9c05..9d82b165 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) + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 209d9c05..9d82b165 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) + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 209d9c05..9d82b165 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) + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 209d9c05..9d82b165 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) + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 209d9c05..9d82b165 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) + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros 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: |