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.

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

Move hid_t from NC_FILE_INFO_T to new struct NC_HDF5_FILE_INFO_T #1076

Merged

Conversation

edhartnett
Copy link
Contributor

@edhartnett edhartnett commented Jul 19, 2018

Part of #856.

In this PR I remove the hid_t field hdfid from the NC_FILE_INFO_T structure. It is relocated to a new NC_HDF5_FILE_INFO_T struct, which exists only in libhdf5.

Similarly, all the hid_t types of the other metadata structs are going to move to new structs which will not be seen in libsrc4.

This PR is ready to merge.

@edhartnett edhartnett reopened this Jul 28, 2018
@edhartnett edhartnett closed this Jul 28, 2018
@edhartnett edhartnett reopened this Jul 29, 2018
@edhartnett edhartnett closed this Jul 29, 2018
@edhartnett edhartnett reopened this Jul 31, 2018
@edhartnett
Copy link
Contributor Author

appveyor builds failing like this:

"C:\projects\netcdf-c\build\ncdump\ocprint.vcxproj" (default target) (110) ->
       (ClCompile target) -> 
         c:\projects\netcdf-c\ncdump\ocprint.c(18): fatal error C1083: Cannot open include file: 'strings.h': No such file or directory [C:\projects\netcdf-c\build\ncdump\ocprint.vcxproj]

I believe you just added ocprint to the CMake build. Probably you should just take it out.

What seems to be happening is that it's expecting strings.h and not finding it in the Microsoft environment. Apparently it's found on Unix.

@WardF
Copy link
Member

WardF commented Aug 1, 2018

I expect you may be right but I need to reconcile it with the lack of a failure on my dev platform e.g. where is it finding strings.h on my system and how do I bring this in line with a ‘standard’ install.

@DennisHeimbigner
Copy link
Collaborator

That one is easy. Change
#include <strings.h>
to
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif

@edhartnett
Copy link
Contributor Author

@WardF can we get this merged? There are many more changes waiting in the queue...

Thanks!

@edhartnett
Copy link
Contributor Author

@WardF can we get this merged please?

@edhartnett edhartnett closed this Aug 4, 2018
@edhartnett edhartnett reopened this Aug 4, 2018
@WardF WardF added this to the 4.7.0 milestone Aug 6, 2018
@WardF WardF self-assigned this Aug 6, 2018
@WardF WardF merged commit 1fec7b4 into Unidata:master Aug 6, 2018
@edhartnett edhartnett deleted the ejh_hdf5_sep_file_info branch August 6, 2018 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants