3 files changed, 11 insertions, 18 deletions
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 8c2497bde..9b9e24ac7 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -446,10 +446,8 @@ details. */
            as number of partitions on tape.
       271: Export posix_spawn, posix_spawnp, and helper functions.
       272: Export tm_gmtoff and tm_zone members.
-      273: Introduce account mapping from Windows account DBs.  Add CW_SETENT,
-	   CW_GETENT, CW_ENDENT, CW_GETNSSSEP, CW_GETPWSID, CW_GETGRSID,
-	   CW_CYGNAME_FROM_WINNAME.
-      274: Export __cxa_atexit.
+      273: Skipped.
+      274: Export __cxa_atexit and __cxa_finalize.
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
index 39639b877..321a58ec8 100644
--- a/winsup/cygwin/include/sys/cygwin.h
+++ b/winsup/cygwin/include/sys/cygwin.h
@@ -216,20 +216,6 @@ enum
   CW_TOKEN_RESTRICTED    = 1
 };
 
-/* Enumeration source constants for CW_SETENT called from mkpasswd/mkgroup. */
-enum nss_enum_t
-{
-  ENUM_NONE = 0x00,
-  ENUM_CACHE = 0x01,
-  ENUM_FILES = 0x02,
-  ENUM_BUILTIN = 0x04,
-  ENUM_LOCAL = 0x08,
-  ENUM_PRIMARY = 0x10,
-  ENUM_TDOMS = 0x20,
-  ENUM_TDOMS_ALL = 0x40,
-  ENUM_ALL = 0x7f
-};
-
 #define CW_NEXTPID	0x80000000	/* or with pid to get next one */
 uintptr_t cygwin_internal (cygwin_getinfo_types, ...);
 
diff --git a/winsup/cygwin/include/sys/file.h b/winsup/cygwin/include/sys/file.h
index 9b72ee9c2..6dabeb70c 100644
--- a/winsup/cygwin/include/sys/file.h
+++ b/winsup/cygwin/include/sys/file.h
@@ -39,8 +39,17 @@
 #define LOCK_NB		0x04		/* don't block when locking */
 #define LOCK_UN		0x08		/* unlock file */
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 extern int flock _PARAMS ((int, int));
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 #endif