Corrected MSVC-related issues with DAP. Renamed variables to avoid collision with reserved words, enclosed includes with appropriate ifdefs, other minor changes.

cmake_config.h.in

@@ -13,7 +13,8 @@
   #define fdopen _fdopen
   #define write _write
   #define snprintf _snprintf
-  
+  #define strcasecmp _stricmp
+  #define strtoll _strtoi64
 #endif
 
 #ifndef CONFIG_H

libdap2/cdf3.c

@@ -426,7 +426,7 @@ makenewstruct3(CDFnode* node, CDFnode* templatenode)
     CDFnode* newstruct = (CDFnode*)calloc(1,sizeof(CDFnode));
     if(newstruct == NULL) return NULL;
     newstruct->nctype = NC_Structure;
-    newstruct->virtual = 1;
+    newstruct->nc_virtual = 1;
     newstruct->ocname = nulldup(templatenode->ocname);
     newstruct->ocnode = templatenode->ocnode;
     newstruct->ncbasename = nulldup(templatenode->ncbasename);

libdap2/constraints3.c

@@ -45,7 +45,7 @@ parsedapconstraints(NCDAPCOMMON* dapcomm, char* constraints,
    in the declsizes.
    Two things to watch out for:
    1. suffix paths are legal (i.e. incomplete paths)
-   2. virtual nodes (via restruct)
+   2. nc_virtual nodes (via restruct)
 */
 
 NCerror

libdap2/daputil.c

@@ -6,7 +6,9 @@
 
 #include "config.h"
 
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
 
 #include "oc.h"
 extern int oc_dumpnode(OClink, OCddsnode);

libdap2/getvara3.c

@@ -617,13 +617,13 @@ movetofield(NCDAPCOMMON* nccomm,
     xnext = (CDFnode*)nclistget(path,depth+1);
     ASSERT((xnext != NULL));
     fieldindex = findfield(xnode,xnext);
-    /* If the next node is a virtual node, then
+    /* If the next node is a nc_virtual node, then
        we need to effectively
        ignore it and use the appropriate subnode.
        If the next node is a re-struct'd node, then
        use it as is.
     */
-    if(xnext->virtual) {
+    if(xnext->nc_virtual) {
         CDFnode* xgrid = xnext;
 	xnext = (CDFnode*)nclistget(path,depth+2); /* real node */
         gridindex = fieldindex;

libdap2/nccommon.h

@@ -256,7 +256,7 @@ typedef struct CDFnode {
     BOOL	     visible;       /* 1 => node is present in derived tree; independent of elided flag */
     BOOL	     zerodim;       /* 1 => node has a zero dimension */
     /* These two flags track the effects on grids of constraints */
-    BOOL             virtual;       /* node added by regrid */
+    BOOL             nc_virtual;       /* node added by regrid */
 #ifdef PROJECTED
     BOOL             projected;     /* node referenced by projection */
 #endif

libdap2/ncdap3.h

@@ -8,7 +8,9 @@
 
 #include "config.h"
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <string.h>

oc2/daplex.c

@@ -2,7 +2,9 @@
    See the COPYRIGHT file for more information. */
 
 #include "config.h"
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
+#endif
 #include "dapparselex.h"
 
 #undef URLCVT /* NEVER turn this on */

oc2/oc.h

@@ -425,11 +425,14 @@ extern void oc_logtext(int tag, const char* text);
 /**************************************************/
 /* Miscellaneous */
 
+/* For some reason, the MSVC compiler doesn't like this. */
+#ifndef _MSC_VER
 /* Return the size of the in-memory or on-disk
    data chunk returned by the server for a given tree.
    Zero implies it is not defined.
 */
 extern OCerror oc_raw_xdrsize(OClink,OCddsnode,off_t*);
+#endif
 
 /* Reclaim the strings within a string vector, but not the vector itself.
    This is useful for reclaiming the result of oc_data_read

oc2/occompile.c

@@ -2,7 +2,9 @@
    See the COPYRIGHT file for more information. */
 
 #include "config.h"
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include "ocinternal.h"
 #include "ocdebug.h"

oc2/ocread.c

@@ -18,6 +18,11 @@
 #include "ocrc.h"
 #include "occurlfunctions.h"
 
+#ifdef _MSC_VER
+#include <io.h>
+#endif
+
+
 /*Forward*/
 static int readpacket(OCstate* state, OCURI*, OCbytes*, OCdxd, long*);
 static int readfile(const char* path, const char* suffix, OCbytes* packet);

oc2/xxdr.c

@@ -52,6 +52,11 @@
 #include <unistd.h>
 #endif
 
+#ifdef _MSC_VER
+#include <wchar.h>
+#include <sys/types.h>
+#endif
+
 #ifdef ENDIAN_VALIDATE
 #include <arpa/inet.h>
 #endif

oc2/xxdr.h

@@ -114,7 +114,7 @@ extern void xxdrntohdouble(char*,double*);
 typedef struct XXDR XXDR; /* forward */
 
 /* Assume |off_t| == |void*| */
-struct XXDR {
+typedef struct XXDR {
   char* data;
   off_t pos; /* relative to data;
                  may be a cache of underlying stream pos */