dispatch.h->ncdispatch.h to avoid visualstudio filename conflict

configure.ac

@@ -1198,7 +1198,7 @@ dnl 	 fi
 #   else
 #      AC_MSG_RESULT([without parallel])         
       # Modify netcdf.h to include defs for missing parallel stuff.
-      # WARNING: the similar defs in libdispatch/dispatch.h must match this
+      # WARNING: the similar defs in libdispatch/ncdispatch.h must match this
 # When doing distcheck, this cmd will fail because of
 # the permissions set on $top_builddir.
 # So, we forcibly reset the permissions

libdispatch/Makefile.am

@@ -16,7 +16,7 @@ AM_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/liblib -I${top_srcdir}/lib
 noinst_LTLIBRARIES = libdispatch.la
 
 # The source files.
-libdispatch_la_SOURCES = dispatch.h parallel.c copy.c file.c dim.c	\
+libdispatch_la_SOURCES = ncdispatch.h parallel.c copy.c file.c dim.c	\
 att.c error.c var.c dispatch.c
 
 # Add functions only found in netCDF-4.

libdispatch/att.c

@@ -7,7 +7,7 @@
   "$Id: nc4.c,v 1.1 2010/06/01 15:46:50 ed Exp $" 
 */
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 static nc_type longtype = (sizeof(long) == sizeof(int) ? NC_INT : NC_INT64);
 

libdispatch/copy.c

@@ -6,7 +6,7 @@
    "$Id: copy.c,v 1.1 2010/06/01 15:46:49 ed Exp $" 
 */
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 #include <nc_logging.h>
 
 #ifdef USE_NETCDF4

libdispatch/dap.c

@@ -7,7 +7,7 @@
   "$Id: nc4.c,v 1.1 2010/06/01 15:46:50 ed Exp $" 
 */
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 /* allow access dapurlparse and params while minimizing exposing dapurl.h */
 int

libdispatch/dim.c

@@ -7,7 +7,7 @@
  "$Id: nc4.c,v 1.1 2010/06/01 15:46:50 ed Exp $" 
 */
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 int
 nc_def_dim(int ncid, const char *name, size_t len, int *idp)

libdispatch/dispatch.c

@@ -1,4 +1,4 @@
-#include "dispatch.h"
+#include "ncdispatch.h"
 #define INITCOORD1 if(coord_one[0] != 1) {int i; for(i=0;i<NC_MAX_VAR_DIMS;i++) coord_one[i] = 1;}
 
 /*

libdispatch/error.c

@@ -6,7 +6,7 @@
    "$Id: copy.c,v 1.1 2010/06/01 15:46:49 ed Exp $" 
 */
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 /* Tell the user the version of netCDF. */
 static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $";

libdispatch/file.c

@@ -7,7 +7,7 @@
  "$Id: nc4.c,v 1.1 2010/06/01 15:46:50 ed Exp $" 
 */
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 static int nc_initialized = 0;
 

libdispatch/nc4.c

@@ -7,7 +7,7 @@
  "$Id: nc4.c,v 1.1 2010/06/01 15:46:50 ed Exp $" 
 */
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 /* When you read string type the library will allocate the storage
  * space for the data. This storage space must be freed, so pass the

libdispatch/ncdispatch.h

@@ -3,8 +3,8 @@
  *   See netcdf/COPYRIGHT file for copying and redistribution conditions.
  *********************************************************************/
 
-/* $Id: dispatch.h,v 1.18 2010/06/01 20:11:59 dmh Exp $ */
-/* $Header: /upc/share/CVS/netcdf-3/libdispatch/dispatch.h,v 1.18 2010/06/01 20:11:59 dmh Exp $ */
+/* $Id: ncdispatch.h,v 1.18 2010/06/01 20:11:59 dmh Exp $ */
+/* $Header: /upc/share/CVS/netcdf-3/libdispatch/ncdispatch.h,v 1.18 2010/06/01 20:11:59 dmh Exp $ */
 
 #ifndef _DISPATCH_H
 #define _DISPATCH_H

libdispatch/netcdf.m4

@@ -9,7 +9,7 @@
  "$Id: netcdf.m4,v 1.16 2010/06/01 15:34:50 ed Exp $" 
 */
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 #define INITCOORD1 if(coord_one[0] != 1) {int i; for(i=0;i<NC_MAX_VAR_DIMS;i++) coord_one[i] = 1;}
 
 static nc_type longtype = (sizeof(long) == sizeof(int)?NC_INT:NC_INT64);

libdispatch/parallel.c

@@ -7,7 +7,7 @@
  "$Id: parallel.c,v 1.1 2010/06/01 15:46:50 ed Exp $" 
 */
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 /* This function creates a file for use with parallel I/O. */
 int

libdispatch/stub.c

@@ -1,4 +1,4 @@
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 NC_Dispatch*
 NC_getdefaultdispatch(void)

libdispatch/var.c

@@ -7,7 +7,7 @@
   "$Id: nc4.c,v 1.1 2010/06/01 15:46:50 ed Exp $" 
 */
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 #if defined(__cplusplus)
 /* C++ consts default to internal linkage and must be initialized */

liblib/stub.c

@@ -7,7 +7,7 @@
 /* $Header: /upc/share/CVS/netcdf-3/liblib/stub.c,v 1.8 2010/05/25 13:53:02 ed Exp $ */
 
 #include "config.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 extern int NC3_initialize(void);
 #ifdef USE_NETCDF4

libncdap3/ncd3dispatch.c

@@ -10,7 +10,7 @@
 
 #include "nc.h"
 #include "ncdap3.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 #include "ncd3dispatch.h"
 
 static int

libncdap3/ncd3dispatch.h

@@ -37,7 +37,7 @@
 
 #include <stddef.h> /* size_t, ptrdiff_t */
 #include "netcdf.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 #if defined(__cplusplus)
 extern "C" {

libncdap3/ncdap3.h

@@ -23,7 +23,7 @@
 #include "ncdap.h"
 #include "getvara.h"
 #include "constraints3.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 
 #ifndef USE_NETCDF4

libncdap4/ncd4dispatch.c

@@ -11,7 +11,7 @@
 #include "ncdap4.h"
 #include "nc.h"
 #include "ncd4dispatch.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 static int
 NCD4_create(const char *path, int cmode,

libncdap4/ncd4dispatch.h

@@ -37,7 +37,7 @@
 
 #include <stddef.h> /* size_t, ptrdiff_t */
 #include "netcdf.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 #if defined(__cplusplus)
 extern "C" {

libsrc/attr.m4

@@ -11,7 +11,7 @@ dnl
 /* $Id: attr.m4,v 2.39 2010/05/26 18:11:08 dmh Exp $ */
 
 #include "nc.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 #include "nc3dispatch.h"
 #include <stdlib.h>
 #include <string.h>

libsrc/nc.c

@@ -16,7 +16,7 @@
 #endif
 
 #include "nc.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 #include "rnd.h"
 #include "ncx.h"
 

libsrc/nc3dispatch.h

@@ -37,7 +37,7 @@
 
 #include <stddef.h> /* size_t, ptrdiff_t */
 #include "netcdf.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 
 

libsrc/ncx.h

@@ -7,7 +7,7 @@
 #ifndef _NCX_H_
 #define _NCX_H_
 
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 /*
  * An external data representation interface.

libsrc4/nc4attr.c

@@ -17,7 +17,7 @@ $Id: nc4attr.c,v 1.78 2010/05/25 17:54:23 dmh Exp $
 #include "nc4internal.h"
 #include "nc.h"
 #include "nc4dispatch.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 #ifdef USE_PNETCDF
 #include <pnetcdf.h>

libsrc4/nc4dispatch.c

@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include "nc.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 #include "nc4dispatch.h"
 
 NC_Dispatch NC4_dispatcher = {

libsrc4/nc4dispatch.h

@@ -37,7 +37,7 @@
 
 #include <stddef.h> /* size_t, ptrdiff_t */
 #include <errno.h>  /* netcdf functions sometimes return system errors */
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 #if defined(__cplusplus)
 extern "C" {

libsrc4/nc4file.c

@@ -12,7 +12,7 @@
 #include "nc.h"
 #include <H5DSpublic.h>
 #include "nc4dispatch.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 #ifdef USE_HDF4
 #include <mfhdf.h>

libsrc4/stub3.c

@@ -1,6 +1,6 @@
 #include "config.h"
 #include "netcdf.h"
-#include "dispatch.h"
+#include "ncdispatch.h"
 
 extern NC_Dispatch* NC3_dispatch_table;
 

man4/netcdf.texi

@@ -5918,7 +5918,7 @@ Currently, the following four dispatch tables are supported.
 The dispatch table represents a distillation of the
 netcdf API down to a minimal set of internal operations. The
 format of the dispatch table is defined in the file
-libdispatch/dispatch.h.  Every new dispatch table must
+libdispatch/ncdispatch.h.  Every new dispatch table must
 define this minimal set of operations.
 
 @unnumberedsec Adding a New Dispatch Table
@@ -5938,7 +5938,7 @@ used for non-static procedures to be entered into the
 dispatch table and ncm for all other non-static procedures.
 
 @unnumberedsec Step 3.
-Modify file libdispatch/dispatch.h as follows.
+Modify file libdispatch/ncdispatch.h as follows.
 @itemize
 @item Add a index for this implementation: 
 @example