3 files changed, 9 insertions, 2 deletions
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 89cd8b03b..adb3947b1 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -186,12 +186,17 @@ details. */
 		  truncf
        76: mallinfo
        77: thread-safe exit/at_exit
+       78: Export acl32 aclcheck32 aclfrommode32 aclfrompbits32 aclfromtext32
+		  aclsort32 acltomode32 acltopbits32 acltotext32 facl32
+		  fgetpos64 fopen64 freopen64 fseeko64 fsetpos64 ftello64
+		  _open64 _lseek64 _fstat64 _stat64 mknod32
+
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 77
+#define CYGWIN_VERSION_API_MINOR 78
 
      /* There is also a compatibity version number associated with the
 	shared memory regions.  It is incremented when incompatible
diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
index aa3619b2a..cc5641c4a 100644
--- a/winsup/cygwin/include/sys/cygwin.h
+++ b/winsup/cygwin/include/sys/cygwin.h
@@ -183,7 +183,7 @@ struct per_process
      add an item. */
   DWORD unused2[5];
 
-#ifdef __INSIDE_CYGWIN__
+#if defined (__INSIDE_CYGWIN__) && defined (__cplusplus)
   ResourceLocks *resourcelocks;
   MTinterface *threadinterface;
 #else
diff --git a/winsup/cygwin/include/sys/mman.h b/winsup/cygwin/include/sys/mman.h
index 70c003589..5059f894a 100644
--- a/winsup/cygwin/include/sys/mman.h
+++ b/winsup/cygwin/include/sys/mman.h
@@ -40,7 +40,9 @@ extern "C" {
 #define MS_SYNC 2
 #define MS_INVALIDATE 4
 
+#ifndef __INSIDE_CYGWIN__
 extern caddr_t mmap (caddr_t __addr, size_t __len, int __prot, int __flags, int __fd, off_t __off);
+#endif
 extern int munmap (caddr_t __addr, size_t __len);
 extern int mprotect (caddr_t __addr, size_t __len, int __prot);
 extern int msync (caddr_t __addr, size_t __len, int __flags);