From a898ee19d65a967761f20ede7516077414fc6a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 31 Jul 2007 17:17:51 +0000 Subject: [PATCH] Ahem... build fix. Forgot that there were some last minute changes that shouldn't have been part of the commit... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21773 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/Notifications.h | 14 ++++++++------ src/system/kernel/Jamfile | 6 +++++- src/system/kernel/Notifications.cpp | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/headers/private/kernel/Notifications.h b/headers/private/kernel/Notifications.h index f88e3357e8..6f59c2ad44 100644 --- a/headers/private/kernel/Notifications.h +++ b/headers/private/kernel/Notifications.h @@ -12,19 +12,21 @@ #include -#include - #include #include -#include -#include #include -#include -#include #ifdef __cplusplus +#include + +#include +#include +#include +#include + + class NotificationService; class NotificationListener diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile index 34f0e5300c..96ca4d3746 100644 --- a/src/system/kernel/Jamfile +++ b/src/system/kernel/Jamfile @@ -10,6 +10,8 @@ SubDir HAIKU_TOP src system kernel ; SubDirC++Flags $(defines) ; } +UsePrivateHeaders shared ; + AddResources kernel_$(TARGET_ARCH) : kernel.rdef ; KernelMergeObject kernel_core.o : @@ -24,6 +26,7 @@ KernelMergeObject kernel_core.o : lock.c main.c module.cpp + Notifications.cpp port.c real_time_clock.c scheduler.cpp @@ -68,11 +71,12 @@ KernelLd kernel_$(TARGET_ARCH) : linkhack.so - # kernel libroot parts + # kernel parts borrowed from libroot and others kernel_os_main.o kernel_os_arch_$(TARGET_ARCH).o kernel_posix.o kernel_posix_arch_$(TARGET_ARCH).o + kernel_misc.o $(HAIKU_STATIC_LIBSUPC++) diff --git a/src/system/kernel/Notifications.cpp b/src/system/kernel/Notifications.cpp index 0e2f1d8b8a..10eff243b3 100644 --- a/src/system/kernel/Notifications.cpp +++ b/src/system/kernel/Notifications.cpp @@ -335,7 +335,7 @@ NotificationManager::UpdateListener(const char* serviceName, extern "C" void notifications_init(void) { - status_t status = NotificationManager::CreateDefault(); + status_t status = NotificationManager::CreateManager(); if (status < B_OK) { panic("Creating the notification manager failed: %s\n", strerror(status));