diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:26:46 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:26:46 +0000 |
commit | df6d86d8822458cf787b5f5620490d6a962da3b8 (patch) | |
tree | 8d499fa24a32a195bd6e384dfb70639c45c4a9bb /catgets/catgetsinfo.h | |
parent | 2c7242b971fd7b63fa842df15ec6fa3d0ff8aeb0 (diff) | |
parent | 1949a12d5da678a8532359a95717d8e63910d93b (diff) |
Merge commit 'refs/top-bases/t/____longjmp_chk' into t/____longjmp_chkt/____longjmp_chk
Diffstat (limited to 'catgets/catgetsinfo.h')
-rw-r--r-- | catgets/catgetsinfo.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/catgets/catgetsinfo.h b/catgets/catgetsinfo.h index e48692750b..648042e783 100644 --- a/catgets/catgetsinfo.h +++ b/catgets/catgetsinfo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2016 Free Software Foundation, Inc. +/* Copyright (C) 1996-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>. @@ -21,12 +21,12 @@ struct catalog_obj { - u_int32_t magic; - u_int32_t plane_size; - u_int32_t plane_depth; + uint32_t magic; + uint32_t plane_size; + uint32_t plane_depth; /* This is in fact two arrays in one: always a pair of name and pointer into the data area. */ - u_int32_t name_ptr[0]; + uint32_t name_ptr[0]; }; @@ -37,7 +37,7 @@ typedef struct catalog_info size_t plane_size; size_t plane_depth; - u_int32_t *name_ptr; + uint32_t *name_ptr; const char *strings; struct catalog_obj *file_ptr; |