lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Revert "Fix _IO_JUMPS_OFFSET -Wundef warnings"

Browse Source 
This reverts commit f7efd7c3df.
This commit is contained in:
Will Newton
2014-03-17 20:37:42 +00:00
parent d0ac132472
commit c15cf13a8a
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2014-03-17 Will Newton <will.newton@linaro.org> 2014-03-17 Will Newton <will.newton@linaro.org>
* libio/genops.c: Revert previous change.
* libio/libioP.h: Likewise.
* stdio-common/vfprintf.c: Likewise.
* sysdeps/generic/math_private.h: Revert previous * sysdeps/generic/math_private.h: Revert previous
change. change.

2
libio/genops.c
View File

@ -624,7 +624,7 @@ _IO_old_init (fp, flags)
fp->_IO_save_end = NULL; fp->_IO_save_end = NULL;
fp->_markers = NULL; fp->_markers = NULL;
fp->_cur_column = 0; fp->_cur_column = 0;
#ifdef _IO_JUMPS_OFFSET #if _IO_JUMPS_OFFSET
fp->_vtable_offset = 0; fp->_vtable_offset = 0;
#endif #endif
#ifdef _IO_MTSAFE_IO #ifdef _IO_MTSAFE_IO

2
libio/libioP.h
View File

@ -106,7 +106,7 @@ extern "C" {
#define _IO_WIDE_JUMPS(THIS) ((struct _IO_FILE *) (THIS))->_wide_data->_wide_vtable #define _IO_WIDE_JUMPS(THIS) ((struct _IO_FILE *) (THIS))->_wide_data->_wide_vtable
#define _IO_CHECK_WIDE(THIS) (((struct _IO_FILE *) (THIS))->_wide_data != NULL) #define _IO_CHECK_WIDE(THIS) (((struct _IO_FILE *) (THIS))->_wide_data != NULL)
#ifdef _IO_JUMPS_OFFSET #if _IO_JUMPS_OFFSET
# define _IO_JUMPS_FUNC(THIS) \ # define _IO_JUMPS_FUNC(THIS) \
(*(struct _IO_jump_t **) ((void *) &_IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) \ (*(struct _IO_jump_t **) ((void *) &_IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) \
+ (THIS)->_vtable_offset)) + (THIS)->_vtable_offset))

2
stdio-common/vfprintf.c
View File

@ -2297,7 +2297,7 @@ buffered_vfprintf (_IO_FILE *s, const CHAR_T *format,
hp->_mode = -1; hp->_mode = -1;
#endif #endif
hp->_IO_file_flags = _IO_MAGIC|_IO_NO_READS|_IO_USER_LOCK; hp->_IO_file_flags = _IO_MAGIC|_IO_NO_READS|_IO_USER_LOCK;
#ifdef _IO_JUMPS_OFFSET #if _IO_JUMPS_OFFSET
hp->_vtable_offset = 0; hp->_vtable_offset = 0;
#endif #endif
#ifdef _IO_MTSAFE_IO #ifdef _IO_MTSAFE_IO