added rule for glibconfig.h

2001-09-21  Hans Breuer  <hans@breuer.org>

	* makefile.msc : added rule for glibconfig.h

	* glib/giowin32.c (g_io_channel_new_file) : always open
	in binary mode

	* glib/glib.def : updated externals

	* glib/gwin32.c : re-added LANG_* and SUBLANG_* definitions,
	which are missing from the msvc 5.0 win32 sdk

	* glib/makefile.msc.in : added gbsearcharry

diff --git a/ChangeLog b/ChangeLog
index 9856d5b..faff35b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-09-21  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc : added rule for glibconfig.h
+
+       * glib/giowin32.c (g_io_channel_new_file) : always open
+       in binary mode
+
+       * glib/glib.def : updated externals
+
+       * glib/gwin32.c : re-added LANG_* and SUBLANG_* definitions,
+       which are missing from the msvc 5.0 win32 sdk
+
+       * glib/makefile.msc.in : added gbsearcharry
+
 Thu Sep 20 20:33:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * Rename g_mem_vtable_is_set() to g_mem_is_system_malloc().

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9856d5b..faff35b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,17 @@
+2001-09-21  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc : added rule for glibconfig.h
+
+       * glib/giowin32.c (g_io_channel_new_file) : always open
+       in binary mode
+
+       * glib/glib.def : updated externals
+
+       * glib/gwin32.c : re-added LANG_* and SUBLANG_* definitions,
+       which are missing from the msvc 5.0 win32 sdk
+
+       * glib/makefile.msc.in : added gbsearcharry
+
 Thu Sep 20 20:33:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * Rename g_mem_vtable_is_set() to g_mem_is_system_malloc().

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9856d5b..faff35b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+2001-09-21  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc : added rule for glibconfig.h
+
+       * glib/giowin32.c (g_io_channel_new_file) : always open
+       in binary mode
+
+       * glib/glib.def : updated externals
+
+       * glib/gwin32.c : re-added LANG_* and SUBLANG_* definitions,
+       which are missing from the msvc 5.0 win32 sdk
+
+       * glib/makefile.msc.in : added gbsearcharry
+
 Thu Sep 20 20:33:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * Rename g_mem_vtable_is_set() to g_mem_is_system_malloc().

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9856d5b..faff35b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,17 @@
+2001-09-21  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc : added rule for glibconfig.h
+
+       * glib/giowin32.c (g_io_channel_new_file) : always open
+       in binary mode
+
+       * glib/glib.def : updated externals
+
+       * glib/gwin32.c : re-added LANG_* and SUBLANG_* definitions,
+       which are missing from the msvc 5.0 win32 sdk
+
+       * glib/makefile.msc.in : added gbsearcharry
+
 Thu Sep 20 20:33:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * Rename g_mem_vtable_is_set() to g_mem_is_system_malloc().

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9856d5b..faff35b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+2001-09-21  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc : added rule for glibconfig.h
+
+       * glib/giowin32.c (g_io_channel_new_file) : always open
+       in binary mode
+
+       * glib/glib.def : updated externals
+
+       * glib/gwin32.c : re-added LANG_* and SUBLANG_* definitions,
+       which are missing from the msvc 5.0 win32 sdk
+
+       * glib/makefile.msc.in : added gbsearcharry
+
 Thu Sep 20 20:33:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * Rename g_mem_vtable_is_set() to g_mem_is_system_malloc().

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9856d5b..faff35b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+2001-09-21  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc : added rule for glibconfig.h
+
+       * glib/giowin32.c (g_io_channel_new_file) : always open
+       in binary mode
+
+       * glib/glib.def : updated externals
+
+       * glib/gwin32.c : re-added LANG_* and SUBLANG_* definitions,
+       which are missing from the msvc 5.0 win32 sdk
+
+       * glib/makefile.msc.in : added gbsearcharry
+
 Thu Sep 20 20:33:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * Rename g_mem_vtable_is_set() to g_mem_is_system_malloc().

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9856d5b..faff35b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+2001-09-21  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc : added rule for glibconfig.h
+
+       * glib/giowin32.c (g_io_channel_new_file) : always open
+       in binary mode
+
+       * glib/glib.def : updated externals
+
+       * glib/gwin32.c : re-added LANG_* and SUBLANG_* definitions,
+       which are missing from the msvc 5.0 win32 sdk
+
+       * glib/makefile.msc.in : added gbsearcharry
+
 Thu Sep 20 20:33:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * Rename g_mem_vtable_is_set() to g_mem_is_system_malloc().

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9856d5b..faff35b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+2001-09-21  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc : added rule for glibconfig.h
+
+       * glib/giowin32.c (g_io_channel_new_file) : always open
+       in binary mode
+
+       * glib/glib.def : updated externals
+
+       * glib/gwin32.c : re-added LANG_* and SUBLANG_* definitions,
+       which are missing from the msvc 5.0 win32 sdk
+
+       * glib/makefile.msc.in : added gbsearcharry
+
 Thu Sep 20 20:33:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * Rename g_mem_vtable_is_set() to g_mem_is_system_malloc().

diff --git a/glib/giowin32.c b/glib/giowin32.c
index f8b40bb..417779c 100644 (file)
--- a/glib/giowin32.c
+++ b/glib/giowin32.c
@@ -1161,7 +1161,8 @@ g_io_channel_new_file (const gchar  *filename,
     }
 
 
-  fid = open (filename, flags, pmode);
+  /* always open 'untranslated' */
+  fid = open (filename, flags | _O_BINARY, pmode);
   if (fid < 0)
     {
       g_set_error (error, G_FILE_ERROR,

diff --git a/glib/glib.def b/glib/glib.def
index 00de252..c24f57e 100644 (file)
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -52,6 +52,8 @@ EXPORTS
        g_bsearch_array_lookup
        g_bsearch_array_remove
        g_bsearch_array_remove_node
+       g_build_filename
+       g_build_path
        g_byte_array_append
        g_byte_array_free
        g_byte_array_new
@@ -166,6 +168,7 @@ EXPORTS
        g_hash_table_lookup
        g_hash_table_lookup_extended
        g_hash_table_new
+       g_hash_table_new_full
        g_hash_table_remove
        g_hash_table_size
        g_hook_alloc
@@ -544,6 +547,7 @@ EXPORTS
        g_string_append_c
        g_string_append_len
        g_string_append_unichar
+       g_string_ascii_down
        g_string_assign
        g_string_chunk_free
        g_string_chunk_insert

diff --git a/glib/gwin32.c b/glib/gwin32.c
index fc1c0ee..42e2b5e 100644 (file)
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -225,6 +225,120 @@ g_win32_closedir (DIR *dir)
 }
 #endif
 
+/* msvc 5.0 headers don't have latest language and sublanguage codes */
+#ifndef LANG_ARMENIAN
+#define LANG_ARMENIAN 0x2b
+#endif
+#ifndef LANG_ASSAMESE
+#define LANG_ASSAMESE 0x4d
+#endif
+#ifndef LANG_AZERI
+#define LANG_AZERI 0x2c
+#endif
+#ifndef LANG_BENGALI
+#define LANG_BENGALI 0x45
+#endif
+#ifndef LANG_GEORGIAN
+#define LANG_GEORGIAN 0x37
+#endif
+#ifndef LANG_GUJARATI
+#define LANG_GUJARATI 0x47
+#endif
+#ifndef LANG_HINDI
+#define LANG_HINDI 0x39
+#endif
+#ifndef LANG_KANNADA
+#define LANG_KANNADA 0x4b
+#endif
+#ifndef LANG_KASHMIRI
+#define LANG_KASHMIRI 0x60
+#endif
+#ifndef LANG_KAZAK
+#define LANG_KAZAK 0x3f
+#endif
+#ifndef LANG_KONKANI
+#define LANG_KONKANI 0x57
+#endif
+#ifndef LANG_MACEDONIAN
+#define LANG_MACEDONIAN 0x2f
+#endif
+#ifndef LANG_MALAY
+#define LANG_MALAY 0x3e
+#endif
+#ifndef LANG_MALAYALAM
+#define LANG_MALAYALAM 0x4c
+#endif
+#ifndef LANG_MANIPURI
+#define LANG_MANIPURI 0x58
+#endif
+#ifndef LANG_MARATHI
+#define LANG_MARATHI 0x4e
+#endif
+#ifndef LANG_NEPALI
+#define LANG_NEPALI 0x61
+#endif
+#ifndef LANG_ORIYA
+#define LANG_ORIYA 0x48
+#endif
+#ifndef LANG_PUNJABI
+#define LANG_PUNJABI 0x46
+#endif
+#ifndef LANG_SANSKRIT
+#define LANG_SANSKRIT 0x4f
+#endif
+#ifndef LANG_SINDHI
+#define LANG_SINDHI 0x59
+#endif
+#ifndef LANG_SWAHILI
+#define LANG_SWAHILI 0x41
+#endif
+#ifndef LANG_TAMIL
+#define LANG_TAMIL 0x49
+#endif
+#ifndef LANG_TATAR
+#define LANG_TATAR 0x44
+#endif
+#ifndef LANG_TELUGU
+#define LANG_TELUGU 0x4a
+#endif
+#ifndef LANG_URDU
+#define LANG_URDU 0x20
+#endif
+#ifndef LANG_UZBEK
+#define LANG_UZBEK 0x43
+#endif
+
+#ifndef SUBLANG_CHINESE_MACAU
+#define SUBLANG_CHINESE_MACAU 0x05
+#endif
+#ifndef SUBLANG_ENGLISH_ZIMBABWE
+#define SUBLANG_ENGLISH_ZIMBABWE 0x0c
+#endif
+#ifndef SUBLANG_ENGLISH_PHILIPPINES
+#define SUBLANG_ENGLISH_PHILIPPINES 0x0d
+#endif
+#ifndef SUBLANG_FRENCH_MONACO
+#define SUBLANG_FRENCH_MONACO 0x06
+#endif
+#ifndef SUBLANG_KASHMIRI_INDIA
+#define SUBLANG_KASHMIRI_INDIA 0x02
+#endif
+#ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
+#define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
+#endif
+#ifndef SUBLANG_NEPALI_INDIA
+#define SUBLANG_NEPALI_INDIA 0x02
+#endif
+#ifndef SUBLANG_URDU_PAKISTAN
+#define SUBLANG_URDU_PAKISTAN 0x01
+#endif
+#ifndef SUBLANG_URDU_INDIA
+#define SUBLANG_URDU_INDIA 0x02
+#endif
+#ifndef SUBLANG_UZBEK_CYRILLIC
+#define SUBLANG_UZBEK_CYRILLIC 0x02
+#endif
+
 /**
  * g_win32_getlocale:
  *

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index d8facbd..38d941b 100644 (file)
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -27,6 +27,7 @@ glib_OBJECTS =                        \
        garray.obj              \
        gasyncqueue.obj         \
        gbacktrace.obj          \
+       gbsearcharray.obj       \
        gcache.obj              \
        gcompletion.obj         \
        gconvert.obj            \

diff --git a/makefile.msc b/makefile.msc
index 433c1f2..bbb24b8 100644 (file)
--- a/makefile.msc
+++ b/makefile.msc
@@ -5,6 +5,7 @@ PARTS = glib gmodule gthread gobject tests
 
 all : \
        config.h \
+       glibconfig.h \
        sub-all
 
 sub-all: 
@@ -22,3 +23,6 @@ sub-one:
 
 config.h: config.h.win32
        copy config.h.win32 config.h
+
+glibconfig.h: glibconfig.h.win32
+       copy glibconfig.h.win32 glibconfig.h