Merge pull request #3560 from marcinslusarz/extern

common: include headers outside of extern "C" block

src/include/libpmem.h

 /*
- * Copyright 2014-2018, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,6 +43,8 @@
 #ifndef LIBPMEM_H
 #define LIBPMEM_H 1
 
+#include <sys/types.h>
+
 #ifdef _WIN32
 #include <pmemcompat.h>
 
@@ -62,8 +64,6 @@
 extern "C" {
 #endif
 
-#include <sys/types.h>
-
 /*
  * This limit is set arbitrary to incorporate a pool header and required
  * alignment plus supply.

src/include/libpmemblk.h

 /*
- * Copyright 2014-2018, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,6 +43,8 @@
 #ifndef LIBPMEMBLK_H
 #define LIBPMEMBLK_H 1
 
+#include <sys/types.h>
+
 #ifdef _WIN32
 #include <pmemcompat.h>
 
@@ -72,8 +74,6 @@
 extern "C" {
 #endif
 
-#include <sys/types.h>
-
 /*
  * opaque type, internal to libpmemblk
  */

src/include/libpmemlog.h

 /*
- * Copyright 2014-2018, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,6 +43,8 @@
 #ifndef LIBPMEMLOG_H
 #define LIBPMEMLOG_H 1
 
+#include <sys/types.h>
+
 #ifdef _WIN32
 #include <pmemcompat.h>
 
@@ -74,8 +76,6 @@
 extern "C" {
 #endif
 
-#include <sys/types.h>
-
 /*
  * opaque type, internal to libpmemlog
  */

src/include/libpmempool.h

 /*
- * Copyright 2016-2018, Intel Corporation
+ * Copyright 2016-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -39,6 +39,10 @@
 #ifndef LIBPMEMPOOL_H
 #define LIBPMEMPOOL_H 1
 
+#include <stdint.h>
+#include <stddef.h>
+#include <limits.h>
+
 #ifdef _WIN32
 #include <pmemcompat.h>
 
@@ -78,11 +82,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
-#include <stddef.h>
-#include <limits.h>
-
-
 /* PMEMPOOL CHECK */
 
 /*

src/include/librpmem.h

 /*
- * Copyright 2016-2018, Intel Corporation
+ * Copyright 2016-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -42,13 +42,13 @@
 #ifndef LIBRPMEM_H
 #define LIBRPMEM_H 1
 
+#include <sys/types.h>
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <sys/types.h>
-#include <stdint.h>
-
 typedef struct rpmem_pool RPMEMpool;
 
 #define RPMEM_POOL_HDR_SIG_LEN	8

src/include/libvmem.h

 /*
- * Copyright 2014-2017, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,6 +41,9 @@
 #ifndef LIBVMEM_H
 #define LIBVMEM_H 1
 
+#include <sys/types.h>
+#include <stddef.h>
+
 #ifdef _WIN32
 #ifndef PMDK_UTF8_API
 #define vmem_create vmem_createW
@@ -57,9 +60,6 @@
 extern "C" {
 #endif
 
-#include <sys/types.h>
-#include <stddef.h>
-
 typedef struct vmem VMEM;	/* opaque type internal to libvmem */
 
 /*

src/include/libvmmalloc.h

 /*
- * Copyright 2014-2017, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,6 +41,8 @@
 #ifndef LIBVMMALLOC_H
 #define LIBVMMALLOC_H 1
 
+#include <sys/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -48,8 +50,6 @@ extern "C" {
 #define VMMALLOC_MAJOR_VERSION 1
 #define VMMALLOC_MINOR_VERSION 1
 
-#include <sys/types.h>
-
 #define VMMALLOC_MIN_POOL ((size_t)(1024 * 1024 * 14)) /* min pool size: 14MB */
 
 /*