Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing the use of private headers in h5tools.h #4641

Closed
wants to merge 2 commits into from
Closed

Removing the use of private headers in h5tools.h #4641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4406ea2
Removing the use of private header in h5tools.h
bmribler Jul 10, 2024
b236b2d
Committing clang-format changes
github-actions[bot] Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/H5private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@
* says FALLTHROUGH to reduce warnings on compilers that don't use
* attributes but do respect fall-through comments.
*
* H5_ATTR_CONST is redefined in tools/h5repack/dynlib_rpk.c to quiet
* gcc warnings (it has to use the public API and can't include this
* file). Be sure to update that file if the #ifdefs change here.
* H5_ATTR_FORMAT and H5_ATTR_UNUSED are redefined in tools/lib/h5tools.h to
* avoid using this private header file there. Please be sure to update that
* file if the #ifdefs change here.
*/
/* clang-format off */
#if defined(H5_HAVE_ATTRIBUTE) && !defined(__SUNPRO_C)
Expand Down
6 changes: 6 additions & 0 deletions tools/lib/h5tools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
#define H5TOOLS_H

#include "hdf5.h"

#if defined(H5_HAVE_ATTRIBUTE) && !defined(__SUNPRO_C)
#define H5_ATTR_FORMAT(X, Y, Z) __attribute__((format(X, Y, Z)))
#define H5_ATTR_UNUSED __attribute__((unused))
#endif

#include "h5tools_error.h"

#define ESCAPE_HTML 1
Expand Down
1 change: 0 additions & 1 deletion tools/lib/h5tools_error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#define H5TOOLS_ERROR_H

#include "H5Epublic.h"
#include "H5Eprivate.h" /* Error handling */

/* tools-HDF5 Error variables */
H5TOOLS_DLLVAR int H5tools_INDENT_g;
Expand Down
Loading