always define G_GNUC_EXTENSION, even when not needed by GLib. That's

2000-03-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
	even when not needed by GLib. That's actually also the way, the
	GLib reference manual describes that macro. Therefore I had to
	remove the lonesome #include <glibconfig.h> in gutils.c, which
	doesn't seem to be needed there however. This change should make
	Ben Gertzfield <che@debian.org> happy.

	* gutils.c: Furthermore two warnings in gutils.c were voided,
	which crept in due to my last change.
This commit is contained in:
Sebastian Wilhelmi 2000-03-21 15:21:41 +00:00 committed by Sebastian Wilhelmi
parent cdb6195572
commit 66034865b1
13 changed files with 111 additions and 23 deletions

View File

@ -1,5 +1,15 @@
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
even when not needed by GLib. That's actually also the way, the
GLib reference manual describes that macro. Therefore I had to
remove the lonesome #include <glibconfig.h> in gutils.c, which
doesn't seem to be needed there however. This change should make
Ben Gertzfield <che@debian.org> happy.
* gutils.c: Furthermore two warnings in gutils.c were voided,
which crept in due to my last change.
* gutils.c (g_get_current_dir): Allocate only up to 128KB for a * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
pathname. While this is an arbitrary value just like 2048, it pathname. While this is an arbitrary value just like 2048, it
seems to be enough (after all, even 4GB is an arbitrary value). seems to be enough (after all, even 4GB is an arbitrary value).

View File

@ -1,5 +1,15 @@
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
even when not needed by GLib. That's actually also the way, the
GLib reference manual describes that macro. Therefore I had to
remove the lonesome #include <glibconfig.h> in gutils.c, which
doesn't seem to be needed there however. This change should make
Ben Gertzfield <che@debian.org> happy.
* gutils.c: Furthermore two warnings in gutils.c were voided,
which crept in due to my last change.
* gutils.c (g_get_current_dir): Allocate only up to 128KB for a * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
pathname. While this is an arbitrary value just like 2048, it pathname. While this is an arbitrary value just like 2048, it
seems to be enough (after all, even 4GB is an arbitrary value). seems to be enough (after all, even 4GB is an arbitrary value).

View File

@ -1,5 +1,15 @@
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
even when not needed by GLib. That's actually also the way, the
GLib reference manual describes that macro. Therefore I had to
remove the lonesome #include <glibconfig.h> in gutils.c, which
doesn't seem to be needed there however. This change should make
Ben Gertzfield <che@debian.org> happy.
* gutils.c: Furthermore two warnings in gutils.c were voided,
which crept in due to my last change.
* gutils.c (g_get_current_dir): Allocate only up to 128KB for a * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
pathname. While this is an arbitrary value just like 2048, it pathname. While this is an arbitrary value just like 2048, it
seems to be enough (after all, even 4GB is an arbitrary value). seems to be enough (after all, even 4GB is an arbitrary value).

View File

@ -1,5 +1,15 @@
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
even when not needed by GLib. That's actually also the way, the
GLib reference manual describes that macro. Therefore I had to
remove the lonesome #include <glibconfig.h> in gutils.c, which
doesn't seem to be needed there however. This change should make
Ben Gertzfield <che@debian.org> happy.
* gutils.c: Furthermore two warnings in gutils.c were voided,
which crept in due to my last change.
* gutils.c (g_get_current_dir): Allocate only up to 128KB for a * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
pathname. While this is an arbitrary value just like 2048, it pathname. While this is an arbitrary value just like 2048, it
seems to be enough (after all, even 4GB is an arbitrary value). seems to be enough (after all, even 4GB is an arbitrary value).

View File

@ -1,5 +1,15 @@
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
even when not needed by GLib. That's actually also the way, the
GLib reference manual describes that macro. Therefore I had to
remove the lonesome #include <glibconfig.h> in gutils.c, which
doesn't seem to be needed there however. This change should make
Ben Gertzfield <che@debian.org> happy.
* gutils.c: Furthermore two warnings in gutils.c were voided,
which crept in due to my last change.
* gutils.c (g_get_current_dir): Allocate only up to 128KB for a * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
pathname. While this is an arbitrary value just like 2048, it pathname. While this is an arbitrary value just like 2048, it
seems to be enough (after all, even 4GB is an arbitrary value). seems to be enough (after all, even 4GB is an arbitrary value).

View File

@ -1,5 +1,15 @@
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
even when not needed by GLib. That's actually also the way, the
GLib reference manual describes that macro. Therefore I had to
remove the lonesome #include <glibconfig.h> in gutils.c, which
doesn't seem to be needed there however. This change should make
Ben Gertzfield <che@debian.org> happy.
* gutils.c: Furthermore two warnings in gutils.c were voided,
which crept in due to my last change.
* gutils.c (g_get_current_dir): Allocate only up to 128KB for a * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
pathname. While this is an arbitrary value just like 2048, it pathname. While this is an arbitrary value just like 2048, it
seems to be enough (after all, even 4GB is an arbitrary value). seems to be enough (after all, even 4GB is an arbitrary value).

View File

@ -1,5 +1,15 @@
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
even when not needed by GLib. That's actually also the way, the
GLib reference manual describes that macro. Therefore I had to
remove the lonesome #include <glibconfig.h> in gutils.c, which
doesn't seem to be needed there however. This change should make
Ben Gertzfield <che@debian.org> happy.
* gutils.c: Furthermore two warnings in gutils.c were voided,
which crept in due to my last change.
* gutils.c (g_get_current_dir): Allocate only up to 128KB for a * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
pathname. While this is an arbitrary value just like 2048, it pathname. While this is an arbitrary value just like 2048, it
seems to be enough (after all, even 4GB is an arbitrary value). seems to be enough (after all, even 4GB is an arbitrary value).

View File

@ -1,5 +1,15 @@
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
even when not needed by GLib. That's actually also the way, the
GLib reference manual describes that macro. Therefore I had to
remove the lonesome #include <glibconfig.h> in gutils.c, which
doesn't seem to be needed there however. This change should make
Ben Gertzfield <che@debian.org> happy.
* gutils.c: Furthermore two warnings in gutils.c were voided,
which crept in due to my last change.
* gutils.c (g_get_current_dir): Allocate only up to 128KB for a * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
pathname. While this is an arbitrary value just like 2048, it pathname. While this is an arbitrary value just like 2048, it
seems to be enough (after all, even 4GB is an arbitrary value). seems to be enough (after all, even 4GB is an arbitrary value).

View File

@ -1138,7 +1138,7 @@ _______EOF
if test -n "$gint64"; then if test -n "$gint64"; then
cat >>$outfile <<_______EOF cat >>$outfile <<_______EOF
${glib_warning_guard}#define G_HAVE_GINT64 1 #define G_HAVE_GINT64 1
${glib_extension}typedef signed $gint64 gint64; ${glib_extension}typedef signed $gint64 gint64;
${glib_extension}typedef unsigned $gint64 guint64; ${glib_extension}typedef unsigned $gint64 guint64;
@ -1348,7 +1348,6 @@ $ac_cv_sizeof_int)
gint64_format='"i"' gint64_format='"i"'
guint64_format='"u"' guint64_format='"u"'
glib_extension= glib_extension=
glib_warning_guard=
gint64_constant='(val)' gint64_constant='(val)'
;; ;;
$ac_cv_sizeof_long) $ac_cv_sizeof_long)
@ -1356,7 +1355,6 @@ $ac_cv_sizeof_long)
gint64_format='"li"' gint64_format='"li"'
guint64_format='"lu"' guint64_format='"lu"'
glib_extension= glib_extension=
glib_warning_guard=
gint64_constant='(val##L)' gint64_constant='(val##L)'
;; ;;
$ac_cv_sizeof_long_long) $ac_cv_sizeof_long_long)
@ -1364,14 +1362,6 @@ $ac_cv_sizeof_long_long)
gint64_format='"'$glib_cv_long_long_format'i"' gint64_format='"'$glib_cv_long_long_format'i"'
guint64_format='"'$glib_cv_long_long_format'u"' guint64_format='"'$glib_cv_long_long_format'u"'
glib_extension='G_GNUC_EXTENSION ' glib_extension='G_GNUC_EXTENSION '
glib_warning_guard="
#if defined (__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8))
# define G_GNUC_EXTENSION __extension__
#else
# define G_GNUC_EXTENSION
#endif
"
gint64_constant='(G_GNUC_EXTENSION (val##LL))' gint64_constant='(G_GNUC_EXTENSION (val##LL))'
;; ;;
esac esac

15
glib.h
View File

@ -1,4 +1,3 @@
/* GLIB - Library of useful routines for C programming /* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
* *
@ -28,6 +27,19 @@
#ifndef __G_LIB_H__ #ifndef __G_LIB_H__
#define __G_LIB_H__ #define __G_LIB_H__
/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
* where this is valid. This allows for warningless compilation of
* "long long" types even in the presence of '-ansi -pedantic'. This
* of course should be with the other GCC-isms below, but then
* glibconfig.h wouldn't load cleanly and it is better to have that
* here, than in glibconfig.h.
*/
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
# define G_GNUC_EXTENSION __extension__
#else
# define G_GNUC_EXTENSION
#endif
/* system specific config file glibconfig.h provides definitions for /* system specific config file glibconfig.h provides definitions for
* the extrema of many of the standard types. These are: * the extrema of many of the standard types. These are:
* *
@ -266,7 +278,6 @@ extern "C" {
#define G_GNUC_UNUSED #define G_GNUC_UNUSED
#endif /* !__GNUC__ */ #endif /* !__GNUC__ */
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
* macros, so we can refer to them as strings unconditionally. * macros, so we can refer to them as strings unconditionally.
*/ */

View File

@ -1,4 +1,3 @@
/* GLIB - Library of useful routines for C programming /* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
* *
@ -28,6 +27,19 @@
#ifndef __G_LIB_H__ #ifndef __G_LIB_H__
#define __G_LIB_H__ #define __G_LIB_H__
/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
* where this is valid. This allows for warningless compilation of
* "long long" types even in the presence of '-ansi -pedantic'. This
* of course should be with the other GCC-isms below, but then
* glibconfig.h wouldn't load cleanly and it is better to have that
* here, than in glibconfig.h.
*/
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
# define G_GNUC_EXTENSION __extension__
#else
# define G_GNUC_EXTENSION
#endif
/* system specific config file glibconfig.h provides definitions for /* system specific config file glibconfig.h provides definitions for
* the extrema of many of the standard types. These are: * the extrema of many of the standard types. These are:
* *
@ -266,7 +278,6 @@ extern "C" {
#define G_GNUC_UNUSED #define G_GNUC_UNUSED
#endif /* !__GNUC__ */ #endif /* !__GNUC__ */
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
* macros, so we can refer to them as strings unconditionally. * macros, so we can refer to them as strings unconditionally.
*/ */

View File

@ -32,8 +32,6 @@
#include <config.h> #include <config.h>
#endif #endif
#include "glibconfig.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -334,8 +332,8 @@ g_dirname (const gchar *file_name)
gchar* gchar*
g_get_current_dir (void) g_get_current_dir (void)
{ {
gchar *buffer; gchar *buffer = NULL;
gchar *dir; gchar *dir = NULL;
static gulong max_len = (G_PATH_LENGTH == -1) ? 2048 : G_PATH_LENGTH; static gulong max_len = (G_PATH_LENGTH == -1) ? 2048 : G_PATH_LENGTH;
/* We don't use getcwd(3) on SUNOS, because, it does a popen("pwd") /* We don't use getcwd(3) on SUNOS, because, it does a popen("pwd")

View File

@ -32,8 +32,6 @@
#include <config.h> #include <config.h>
#endif #endif
#include "glibconfig.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -334,8 +332,8 @@ g_dirname (const gchar *file_name)
gchar* gchar*
g_get_current_dir (void) g_get_current_dir (void)
{ {
gchar *buffer; gchar *buffer = NULL;
gchar *dir; gchar *dir = NULL;
static gulong max_len = (G_PATH_LENGTH == -1) ? 2048 : G_PATH_LENGTH; static gulong max_len = (G_PATH_LENGTH == -1) ? 2048 : G_PATH_LENGTH;
/* We don't use getcwd(3) on SUNOS, because, it does a popen("pwd") /* We don't use getcwd(3) on SUNOS, because, it does a popen("pwd")