Since fsproto.h is now C++ safe, it must be correctly included.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7928 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/kernel/file_systems/udf/CachedBlock.h

@@ -15,12 +15,13 @@
 	Axel Dörfler, [email protected]
 */
 
+#include <fsproto.h>
+
 extern "C" {
 	#ifndef _IMPEXP_KERNEL
 	#	define _IMPEXP_KERNEL
 	#endif
 	
-	#include <fsproto.h>
 	#include "lock.h"
 	#include "cache.h"
 }

src/add-ons/kernel/file_systems/udf/Icb.h

@@ -10,13 +10,10 @@
 /*! \file Icb.h
 */
 
-extern "C" {
+#ifndef _IMPEXP_KERNEL
-	#ifndef _IMPEXP_KERNEL
+#	define _IMPEXP_KERNEL
-	#	define _IMPEXP_KERNEL
+#endif
-	#endif
+#include <fsproto.h>
-	
-	#include <fsproto.h>
-}
 
 #include "kernel_cpp.h"
 #include "UdfDebug.h"

src/add-ons/kernel/file_systems/udf/Utils.h

@@ -12,13 +12,10 @@
 	Miscellaneous Udf utility functions.
 */
 
-extern "C" {
+#ifndef _IMPEXP_KERNEL
-	#ifndef _IMPEXP_KERNEL
+#	define _IMPEXP_KERNEL
-	#	define _IMPEXP_KERNEL
+#endif
-	#endif
+#include <fsproto.h>
-	
-	#include <fsproto.h>
-}
 
 #include "UdfStructures.h"
 

src/add-ons/kernel/file_systems/udf/Volume.h

@@ -13,13 +13,10 @@
 */
 
 #include <KernelExport.h>
-extern "C" {
+#ifndef _IMPEXP_KERNEL
-	#ifndef _IMPEXP_KERNEL
+#	define _IMPEXP_KERNEL
-	#	define _IMPEXP_KERNEL
+#endif
-	#endif
+#include <fsproto.h>
-	
-	#include <fsproto.h>
-}
 
 #include "kernel_cpp.h"
 #include "UdfDebug.h"

src/add-ons/kernel/file_systems/udf/udf.cpp

@@ -27,9 +27,7 @@
 #	define _IMPEXP_KERNEL
 #endif
 
-extern "C" {
+#include <fsproto.h>
-	#include <fsproto.h>
-}	// end extern "C"
 
 #if !_KERNEL_MODE
 #	define dprintf printf