Skip to content

Fix Windows export #2861

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

Merged
merged 6 commits into from
Feb 7, 2024
Merged

Fix Windows export #2861

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f557108
Make changes in support of https://github.com/Unidata/netcdf-c/issues…
WardF Feb 6, 2024
a05f874
Remove stale section from documentation.
WardF Feb 6, 2024
a5360ae
Merge branch 'main' into gh2859.wif
WardF Feb 6, 2024
fb537e6
Correct previous fix to remove inclusion of internal header.
WardF Feb 7, 2024
d59660c
Updated netcdf_json.h
WardF Feb 7, 2024
efbb906
Merge branch 'main' into gh2859.wif
WardF Feb 7, 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
13 changes: 0 additions & 13 deletions docs/mainpage.dox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,6 @@ You can find the documentation for netCDF-Fortran here:
- \subpage RELEASE_NOTES
- <A href="https://docs.unidata.ucar.edu/nug/current/getting_and_building_netcdf.html">Getting and Building NetCDF</A>

\subsection nightly_status The Latest NetCDF Build Status

\subsubsection NetCDF-C

- <A href="http://cdash.unidata.ucar.edu/index.php?project=netcdf-c">The netCDF-C Nightly and Continuous Integration Dashboard</A>
- <A href="https://travis-ci.org/Unidata/netcdf-c">NetCDF-C at Travis-CI</A>

\subsubsection NetCDF-Fortran


- <A href="http://cdash.unidata.ucar.edu/index.php?project=netcdf-fortran">The netCDF-Fortran Nightly and Continuous Integration Dashboard</A>
- <A href="https://travis-ci.org/Unidata/netcdf-c">NetCDF-Fortran at Travis-CI</A>

\section learn-more Learn more about using NetCDF-C

- \ref sec_tut
Expand Down
11 changes: 2 additions & 9 deletions include/ncjson.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,13 @@ and do the command:
make makepluginjson
*/

/* Inside libnetcdf and for plugins, export the json symbols */
#ifndef DLLEXPORT
#ifdef _WIN32
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT
#endif
#endif
#include "ncexternl.h"

/* Override for plugins */
#ifdef NETCDF_JSON_H
#define OPTEXPORT static
#else
#define OPTEXPORT DLLEXPORT
#define OPTEXPORT MSC_EXTRA
#endif /*NETCDF_JSON_H*/

/**************************************************/
Expand Down
9 changes: 1 addition & 8 deletions include/netcdf_json.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,7 @@ and do the command:
make makepluginjson
*/

/* Inside libnetcdf and for plugins, export the json symbols */
#ifndef DLLEXPORT
#ifdef _WIN32
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT
#endif
#endif
#include "ncexternl.h"

/* Override for plugins */
#ifdef NETCDF_JSON_H
Expand Down
6 changes: 3 additions & 3 deletions libdispatch/dreg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#include <wchar.h>
#include <locale.h>
//#include <direct.h>
#include "ncexternl.h"

#ifdef _WIN32
__declspec(dllexport)
#endif

EXTERNL
int
getmountpoint(char* keyvalue, size_t size)
{
Expand Down