*** ./libsrc/lookup3.c.ORIG	Tue Jul 19 13:31:17 2011
--- ./libsrc/lookup3.c	Tue Jul 19 13:32:51 2011
***************
*** 50,56 ****
--- 50,60 ----
  #include <stdio.h>      /* defines printf for tests */
  #include <time.h>       /* defines time_t for timings in the test */
  #ifndef HAVE_STDINT_H
+ # ifdef _AIX51
+ #  include <inttypes.h>
+ # else
  #  include "pstdint.h"	/* attempts to define uint32_t etc portably */
+ # endif
  #else
  #  include <stdint.h>
  #endif /* HAVE_STDINT_H */
*** ./include/nc3internal.h.ORIG	Tue Jun 25 15:43:48 2013
--- ./include/nc3internal.h	Tue Jun 25 15:44:31 2013
***************
*** 11,17 ****
--- 11,21 ----
  #include <config.h>
  #include <stddef.h>	/* size_t */
  #ifndef HAVE_STDINT_H
+ # ifdef _AIX51
+ #  include <inttypes.h>
+ # else
  #  include "pstdint.h"	/* attempts to define uint32_t etc portably */
+ # endif
  #else
  #  include <stdint.h>
  #endif /* HAVE_STDINT_H */
*** ./oc2/ocnode.h.ORIG	Tue Jun 25 00:12:35 2013
--- ./oc2/ocnode.h	Tue Jun 25 00:12:48 2013
***************
*** 82,87 ****
  extern void ocnodes_free(OClist*);
  
  /* Merge DAS with DDS or DATADDS*/
! extern int ocddsdasmerge(struct OCstate*, OCnode* das, OCnode* dds);
  
  #endif /*OCNODE_H*/
--- 82,87 ----
  extern void ocnodes_free(OClist*);
  
  /* Merge DAS with DDS or DATADDS*/
! extern OCerror ocddsdasmerge(struct OCstate*, OCnode* das, OCnode* dds);
  
  #endif /*OCNODE_H*/
*** ./oc2/ocinternal.c.ORIG	Tue Jun 25 00:09:20 2013
--- ./oc2/ocinternal.c	Tue Jun 25 00:10:39 2013
***************
*** 38,45 ****
  /* Define default rc files and aliases*/
  static char* rcfilenames[4] = {".daprc",".dodsrc",".ocrc",NULL};
  
! static int ocextractddsinmemory(OCstate*,OCtree*,int);
! static int ocextractddsinfile(OCstate*,OCtree*,int);
  static char* constraintescape(const char* url);
  static OCerror createtempfile(OCstate*,OCtree*);
  static int createtempfile1(char*,char**);
--- 38,45 ----
  /* Define default rc files and aliases*/
  static char* rcfilenames[4] = {".daprc",".dodsrc",".ocrc",NULL};
  
! static OCerror ocextractddsinmemory(OCstate*,OCtree*,int);
! static OCerror ocextractddsinfile(OCstate*,OCtree*,int);
  static char* constraintescape(const char* url);
  static OCerror createtempfile(OCstate*,OCtree*);
  static int createtempfile1(char*,char**);
