Fixed a bunch of rename issues, including Charlie Zender's reported problem...

Makefile.am

@@ -151,6 +151,10 @@ check_nc_config:
 
 install-data-hook:
 
+if BUILD_DLL
+	cp liblib/netcdfdll.def $(DESTDIR)${prefix}/bin
+endif # BUILD_DLL
+
 	@echo ''
 	@echo '+-------------------------------------------------------------+'
 	@echo '| Congratulations! You have successfully installed netCDF!    |'

configure.ac

@@ -83,6 +83,20 @@ AC_CONFIG_SRCDIR([include/netcdf.h])
 
 AC_MSG_NOTICE([checking user options])
 
+# If --enable-dll is specified the DLL will be built. This only works
+# on mingw.
+AC_MSG_CHECKING([whether a win32 DLL is desired])
+AC_ARG_ENABLE([dll],
+              [AS_HELP_STRING([--enable-dll],
+                              [build a win32 DLL (only works on mingw)])])
+test "x$enable_dll" = xyes || enable_dll=no
+AC_MSG_RESULT([$enable_dll])
+if test "x$enable_dll" = xyes; then
+   AC_DEFINE(DLL_NETCDF, 1, [set this only when building a DLL under MinGW])
+   AC_DEFINE(DLL_EXPORT, 1, [set this only when building a DLL under MinGW])
+fi
+AM_CONDITIONAL(BUILD_DLL, [test x$enable_dll = xyes])
+
 # Did the user specify a default minimum blocksize (NCIO_MINBLOCKSIZE) for posixio?
 AC_MSG_CHECKING([whether a NCIO_MINBLOCKSIZE was specified])
 AC_ARG_WITH([minblocksize],

include/nc4internal.h

@@ -102,6 +102,12 @@ typedef enum {VAR, DIM, ATT} NC_OBJ_T;
  * as the netCDF dimid. */
 #define NC_DIMID_ATT_NAME "_Netcdf4Dimid"
 
+/** This is the name of the class HDF5 dimension scale attribute. */
+#define HDF5_DIMSCALE_CLASS_ATT_NAME "CLASS"
+
+/** This is the name of the name HDF5 dimension scale attribute. */
+#define HDF5_DIMSCALE_NAME_ATT_NAME "NAME"
+
 /* Boolean type, to make the code easier to read */
 typedef enum {NC_FALSE = 0, NC_TRUE = 1} nc_bool_t;
 
@@ -126,7 +132,7 @@ typedef struct NC_DIM_INFO
    nc_bool_t unlimited;         /* True if the dimension is unlimited */
    nc_bool_t extended;          /* True if the dimension needs to be extended */
    nc_bool_t too_long;          /* True if len is too big to fit in local size_t. */
-   hid_t hdf_dimscaleid;
+   hid_t hdf_dimscaleid;        /* Non-zero if a DIM_WITHOUT_VARIABLE dataset is in use (no coord var). */
    HDF5_OBJID_T hdf5_objid;
    struct NC_VAR_INFO *coord_var; /* The coord var, if it exists. */
 } NC_DIM_INFO_T;
@@ -344,6 +350,7 @@ int nc4_convert_type(const void *src, void *dest,
 /* These functions do HDF5 things. */
 int rec_detach_scales(NC_GRP_INFO_T *grp, int dimid, hid_t dimscaleid);
 int rec_reattach_scales(NC_GRP_INFO_T *grp, int dimid, hid_t dimscaleid);
+int delete_existing_dimscale_dataset(NC_GRP_INFO_T *grp, int dimid, NC_DIM_INFO_T *dim);
 int nc4_open_var_grp2(NC_GRP_INFO_T *grp, int varid, hid_t *dataset);
 int nc4_put_vara(NC *nc, int ncid, int varid, const size_t *startp,
 		 const size_t *countp, nc_type xtype, int is_long, void *op);

include/nc_tests.h

@@ -22,9 +22,10 @@ for conditions of use.
 #include "netcdf.h"
 //#include "err_macros.h"
 
-
 #define NC_TESTS_MAX_DIMS 1024 /**< NC_MAX_DIMS for tests.  Allows different NC_MAX_DIMS values without breaking this test with a heap or stack overflow. */
 #define MAX_NUM_FORMATS 5 /**< Max number of available binary formats. */
+#define NUM_CLASSIC_TYPES 6 /**< Number of classic types. */
+#define NUM_ENHANCED_TYPES 12 /**< Number of types including enhanced types. */
 
 /** Useful define for tests. */
 /** \{ */

include/netcdf_par.h

@@ -24,6 +24,8 @@ extern "C" {
 /** Use with nc_var_par_access() to set parallel access to collective. */
 #define NC_COLLECTIVE 1
 
+#define EXTERNL MSC_EXTRA extern /**< Needed for DLL build. */
+
 /* Create a file and enable parallel I/O. */
 extern int
 nc_create_par(const char *path, int cmode, MPI_Comm comm, MPI_Info info,

include/rnd.h

@@ -3,6 +3,9 @@
  *      See netcdf/COPYRIGHT file for copying and redistribution conditions.
  */
 /* $Id: rnd.h,v 2.13 1996/12/11 05:46:54 davis Exp $ */
+#ifndef _RND_H
+#define _RND_H
+
 #ifndef _RNDUP
 
 /* useful for aligning memory */
@@ -15,3 +18,5 @@
 #define	M_RNDDOWN(x)  __RNDDOWN(x, M_RND_UNIT)
 
 #endif
+
+#endif /* _RND_H */

libdap4/d4chunk.c

@@ -91,7 +91,7 @@ NCD4_dechunk(NCD4meta* metadata)
     metadata->localchecksumming = metadata->serial.remotechecksumming;
 
     metadata->serial.remotelittleendian = ((hdr.flags & LITTLE_ENDIAN_CHUNK) ? 1 : 0);
-    metadata->serial.dmr = p;
+    metadata->serial.dmr = (char *)p;
     metadata->serial.dmr[hdr.count-1] = '\0';
     metadata->serial.dmr = strdup(metadata->serial.dmr);
     if(metadata->serial.dmr == NULL)

libdispatch/Makefile.am

@@ -31,6 +31,11 @@ libdispatch_la_SOURCES += dgroup.c dvlen.c dcompound.c dtype.c denum.c	\
 dopaque.c dfilter.c ncaux.c
 endif # USE_NETCDF4
 
+# Turn on pre-processor flag when building a DLL for windows.
+if BUILD_DLL
+libdispatch_la_CPPFLAGS += -DDLL_EXPORT
+endif # BUILD_DLL
+
 # Add V2 API convenience library if needed.
 if BUILD_V2
 noinst_LTLIBRARIES += libnetcdf2.la

libdispatch/dfile.c

@@ -1653,20 +1653,20 @@ nc_inq_type(int ncid, nc_type xtype, char *name, size_t *size)
 }
 
 /**
-Check the create mode parameter for sanity.
-
-Some create flags cannot be used if corresponding library features are
-enabled during the build. This function does a pre-check of the mode
-flag before calling the dispatch layer nc_create functions.
-
-\param cmode The creation mode flag.
-
-\returns ::NC_NOERR No error.
-\returns ::NC_ENOTBUILT Requested feature not built into library
-\returns ::NC_NINVAL Invalid combination of modes.
-\internal
-\ingroup dispatch
-\author Ed Hartnett
+ * @internal Check the create mode parameter for sanity.
+ *
+ * Some create flags cannot be used if corresponding library features are
+ * enabled during the build. This function does a pre-check of the mode
+ * flag before calling the dispatch layer nc_create functions.
+ *
+ * @param mode The creation mode flag.
+ *
+ * @return ::NC_NOERR No error.
+ * @return ::NC_ENOTBUILT Requested feature not built into library
+ * @return ::NC_EINVAL Invalid combination of modes.
+ * 
+ * @ingroup dispatch
+ * @author Ed Hartnett
 */
 static int
 check_create_mode(int mode)
@@ -2175,7 +2175,6 @@ openmagic(struct MagicFile* file)
     }
 #ifdef USE_PARALLEL
     if (file->use_parallel) {
-	MPI_Status mstatus;
 	int retval;
 	MPI_Offset size;
 	MPI_Comm comm = MPI_COMM_WORLD;
@@ -2293,7 +2292,6 @@ closemagic(struct MagicFile* file)
     if(file->inmemory) goto done; /* noop*/
 #ifdef USE_PARALLEL
     if (file->use_parallel) {
-	MPI_Status mstatus;
 	int retval;
 	if((retval = MPI_File_close(&file->fh)) != MPI_SUCCESS)
 		{status = NC_EPARINIT; goto done;}