Allow to build as userland modules.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5150 a95241bf-73f2-0310-859d-f6bbb57e9c96
2003-10-24 21:18:53 +00:00
parent cf3ba6b414
commit ad0928ebe3
9 changed files with 11 additions and 14 deletions
@@ -9,16 +9,17 @@
 #include <PPPControl.h>
 #include <KPPPUtils.h>

-#include <kernel_cpp.h>
 #include <LockerHelper.h>

-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/sockio.h>


 #ifdef _KERNEL_MODE
 	#define spawn_thread spawn_kernel_thread
 	#define printf dprintf
+#else
+	#include <cstdio>
 #endif


@@ -9,8 +9,6 @@
 #include <KernelExport.h>
 #include <driver_settings.h>

-#include <kernel_cpp.h>
-
 #include <PPPDefs.h>
 #include "PPPManager.h"

@@ -8,7 +8,6 @@
 #include "DiscoveryPacket.h"

 #include <core_funcs.h>
-#include <kernel_cpp.h>


 DiscoveryPacket::DiscoveryPacket(uint8 code, uint16 sessionID = 0x0000)
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src add-ons kernel network ppp pppoe ;

-# for kernel_cpp.cpp/h and BLocker
+# for kernel_cpp.h and BLocker
 UsePrivateHeaders net ;
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel util ] ;
@@ -10,7 +10,6 @@

 #include <core_funcs.h>
 #include <cstdlib>
-#include <kernel_cpp.h>

 // from libkernelppp
 #include <settings_tools.h>
@@ -9,8 +9,6 @@
 #include <KernelExport.h>
 #include <driver_settings.h>

-#include <kernel_cpp.h>
-
 #include <ethernet_module.h>

 #include <KPPPInterface.h>
@@ -1,14 +1,14 @@
 SubDir OBOS_TOP src add-ons kernel network ppp shared libkernelppp ;

-# for kernel_cpp.cpp/h and BLocker
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core util ] ;
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ;
-
 UsePrivateHeaders net ;
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel util ] ;
 UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ;

+# for kernel_cpp.cpp/h and BLocker
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core util ] ;
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ;
+

 R5KernelStaticLibrary kernelppp :
 	kernel_cpp.cpp
@@ -5,7 +5,7 @@
 //  Copyright (c) 2003 Waldemar Kornewald, [email protected]
 //---------------------------------------------------------------------

-// stdio.h must be included before PPPModule.h/PPPManager.h because
+// cstdio must be included before PPPModule.h/PPPManager.h because
 // dprintf is defined twice with different return values, once with
 // void (KernelExport.h) and once with int (stdio.h).
 #include <cstdio>
@@ -30,6 +30,8 @@

 #ifdef _KERNEL_MODE
 	#include <kernel_cpp.h>
+#else
+	#include <new.h>
 #endif

 #include <stdlib.h>