diff --git a/ChangeLog b/ChangeLog index 1cb258d39..004438377 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-07-30 Ron Steinke + + * glib/giochannel.c docs/reference/glib/glib-sections.txt + tests/iochannel-test.c: removed G_IO_CHANNEL_*_LINE_TERM macros + + * glib/giochannel.c put /**/ and /**/ tags in + the GIOChannel structure + + 2001-07-30 Sebastian Wilhelmi * configure.in: #undef inline before testing whether it works to diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 1cb258d39..004438377 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2001-07-30 Ron Steinke + + * glib/giochannel.c docs/reference/glib/glib-sections.txt + tests/iochannel-test.c: removed G_IO_CHANNEL_*_LINE_TERM macros + + * glib/giochannel.c put /**/ and /**/ tags in + the GIOChannel structure + + 2001-07-30 Sebastian Wilhelmi * configure.in: #undef inline before testing whether it works to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1cb258d39..004438377 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2001-07-30 Ron Steinke + + * glib/giochannel.c docs/reference/glib/glib-sections.txt + tests/iochannel-test.c: removed G_IO_CHANNEL_*_LINE_TERM macros + + * glib/giochannel.c put /**/ and /**/ tags in + the GIOChannel structure + + 2001-07-30 Sebastian Wilhelmi * configure.in: #undef inline before testing whether it works to diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1cb258d39..004438377 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,12 @@ +2001-07-30 Ron Steinke + + * glib/giochannel.c docs/reference/glib/glib-sections.txt + tests/iochannel-test.c: removed G_IO_CHANNEL_*_LINE_TERM macros + + * glib/giochannel.c put /**/ and /**/ tags in + the GIOChannel structure + + 2001-07-30 Sebastian Wilhelmi * configure.in: #undef inline before testing whether it works to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1cb258d39..004438377 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2001-07-30 Ron Steinke + + * glib/giochannel.c docs/reference/glib/glib-sections.txt + tests/iochannel-test.c: removed G_IO_CHANNEL_*_LINE_TERM macros + + * glib/giochannel.c put /**/ and /**/ tags in + the GIOChannel structure + + 2001-07-30 Sebastian Wilhelmi * configure.in: #undef inline before testing whether it works to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1cb258d39..004438377 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2001-07-30 Ron Steinke + + * glib/giochannel.c docs/reference/glib/glib-sections.txt + tests/iochannel-test.c: removed G_IO_CHANNEL_*_LINE_TERM macros + + * glib/giochannel.c put /**/ and /**/ tags in + the GIOChannel structure + + 2001-07-30 Sebastian Wilhelmi * configure.in: #undef inline before testing whether it works to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1cb258d39..004438377 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2001-07-30 Ron Steinke + + * glib/giochannel.c docs/reference/glib/glib-sections.txt + tests/iochannel-test.c: removed G_IO_CHANNEL_*_LINE_TERM macros + + * glib/giochannel.c put /**/ and /**/ tags in + the GIOChannel structure + + 2001-07-30 Sebastian Wilhelmi * configure.in: #undef inline before testing whether it works to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1cb258d39..004438377 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2001-07-30 Ron Steinke + + * glib/giochannel.c docs/reference/glib/glib-sections.txt + tests/iochannel-test.c: removed G_IO_CHANNEL_*_LINE_TERM macros + + * glib/giochannel.c put /**/ and /**/ tags in + the GIOChannel structure + + 2001-07-30 Sebastian Wilhelmi * configure.in: #undef inline before testing whether it works to diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index 44608d906..956fccbe0 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -634,9 +634,6 @@ g_io_channel_set_flags GIOFlags g_io_channel_get_line_term g_io_channel_set_line_term -G_IO_CHANNEL_UNIX_LINE_TERM -G_IO_CHANNEL_DOS_LINE_TERM -G_IO_CHANNEL_MACINTOSH_LINE_TERM g_io_channel_get_buffered g_io_channel_set_buffered g_io_channel_get_encoding diff --git a/tests/iochannel-test.c b/tests/iochannel-test.c index 4832fb241..2b048d98d 100644 --- a/tests/iochannel-test.c +++ b/tests/iochannel-test.c @@ -15,7 +15,7 @@ gint main (gint argc, gchar * argv[]) GString *buffer; gint rlength = 0, wlength = 0, length_out, line_term_len; gboolean block; - const gchar encoding[] = "EUC-JP", line_term[] = G_IO_CHANNEL_UNIX_LINE_TERM; + const gchar encoding[] = "EUC-JP", line_term[] = "\n"; GIOStatus status; GIOFlags flags;