diff --git a/configure.ac b/configure.ac
index deacdc1ec..26a9cd8fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,17 +117,6 @@ AM_CONDITIONAL(HAVE_GCC, [test "$GCC" = "yes"])
AC_CANONICAL_HOST
-AC_MSG_CHECKING([for the BeOS])
-case $host in
- *-*-beos*)
- glib_native_beos="yes"
- ;;
- *)
- glib_native_beos="no"
- ;;
-esac
-AC_MSG_RESULT([$glib_native_beos])
-
dnl
AC_MSG_CHECKING([for Win32])
@@ -1569,15 +1558,6 @@ AS_IF([ test -z "$G_MODULE_IMPL"], [
[G_MODULE_IMPL=G_MODULE_IMPL_DL],[])],
[])
])
-dnl *** load_image (BeOS)
-AS_IF([test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"], [
- AC_CHECK_LIB(root, load_image,
- [G_MODULE_LIBS="-lbe -lroot -lglib-2.0 "
- G_MODULE_LIBS_EXTRA="-L\$(top_builddir_full)/.libs"
- G_MODULE_PLUGIN_LIBS="-L\$(top_builddir_full)/gmodule/.libs -lgmodule"
- G_MODULE_IMPL=G_MODULE_IMPL_BEOS],
- [])
-])
dnl *** NSLinkModule (dyld) in system libraries (Darwin)
AS_IF([ test -z "$G_MODULE_IMPL" ], [
AC_CHECK_FUNC(NSLinkModule,
@@ -2245,15 +2225,6 @@ if test "x$G_THREAD_LIBS" = xerror; then
AC_MSG_ERROR($LIBS_NOT_FOUND_1$have_threads$LIBS_NOT_FOUND_2)
fi
-case $host in
- *-*-beos*)
- G_THREAD_LIBS="-lbe -lroot -lglib-2.0 "
- G_THREAD_LIBS_EXTRA="-L\$(top_builddir_full)/.libs"
- ;;
- *)
- ;;
-esac
-
AC_MSG_CHECKING(thread related libraries)
AC_MSG_RESULT($G_THREAD_LIBS)
@@ -3585,9 +3556,6 @@ g_module_suffix="$glib_gmodule_suffix"
g_pid_type="$glib_pid_type"
case $host in
- *-*-beos*)
- glib_os="#define G_OS_BEOS"
- ;;
*-*-cygwin*)
glib_os="#define G_OS_UNIX
#define G_PLATFORM_WIN32
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index c44219fb3..ae5df6027 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -130,7 +130,6 @@ GLIB_DISABLE_DEPRECATION_WARNINGS
macros
G_OS_WIN32
-G_OS_BEOS
G_OS_UNIX
diff --git a/glib/docs.c b/glib/docs.c
index c7ae282d6..6b4d7d625 100644
--- a/glib/docs.c
+++ b/glib/docs.c
@@ -1539,13 +1539,6 @@
* Windows-specific code in "#ifdef G_OS_WIN32".
*/
-/**
- * G_OS_BEOS:
- *
- * This macro is defined only on BeOS. So you can bracket
- * BeOS-specific code in "#ifdef G_OS_BEOS".
- */
-
/**
* G_OS_UNIX:
*
diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index 91178044d..a9451c8bf 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -230,7 +230,7 @@ g_on_error_query (const gchar *prg_name)
void
g_on_error_stack_trace (const gchar *prg_name)
{
-#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
+#if defined(G_OS_UNIX)
pid_t pid;
gchar buf[16];
gchar *args[4] = { "gdb", NULL, NULL, NULL };
diff --git a/glib/gmain.c b/glib/gmain.c
index 608c1a5bf..ad2570705 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -73,11 +73,6 @@
#include
#endif /* G_OS_WIN32 */
-#ifdef G_OS_BEOS
-#include
-#include
-#endif /* G_OS_BEOS */
-
#include "gmain.h"
#include "garray.h"
diff --git a/glib/gpoll.c b/glib/gpoll.c
index 940abae38..601381a0c 100644
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -359,10 +359,6 @@ g_poll (GPollFD *fds,
#include
#endif /* HAVE_SYS_SELECT_H */
-#ifdef G_OS_BEOS
-#undef NO_FD_SET
-#endif /* G_OS_BEOS */
-
#ifndef NO_FD_SET
# define SELECT_MASK fd_set
#else /* !NO_FD_SET */
diff --git a/glib/gstdio.c b/glib/gstdio.c
index cca4ff566..a78558fcc 100644
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -46,7 +46,7 @@
#include "gstdio.h"
-#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS)
+#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32)
#error Please port this to your operating system
#endif
diff --git a/glib/gutils.c b/glib/gutils.c
index ada9065b9..3b8d3ee10 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -421,7 +421,7 @@ g_find_program_in_path (const gchar *program)
}
path = g_getenv ("PATH");
-#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
+#if defined(G_OS_UNIX)
if (path == NULL)
{
/* There is no 'PATH' in the environment. The default
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 4b68b3d99..e71270cc8 100644
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -16,7 +16,6 @@ EXTRA_DIST += \
gmodule-dld.c \
gmodule-dyld.c \
gmodule-win32.c \
- gmodule-beos.c \
gmodule-ar.c \
gmoduleconf.h.win32 \
gmodule.rc.in
diff --git a/gmodule/gmodule-beos.c b/gmodule/gmodule-beos.c
deleted file mode 100644
index e2f2c0ba8..000000000
--- a/gmodule/gmodule-beos.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* GMODULE - GLIB wrapper code for dynamic module loading
- * Copyright (C) 1998, 2000 Tim Janik
- *
- * BeOS GMODULE implementation
- * Copyright (C) 1999 Richard Offer and Shawn T. Amundson (amundson@gtk.org)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * MT safe
- */
-#include "config.h"
-
-#include /* image (aka DSO) handling functions... */
-
-/*
- * The BeOS doesn't use the same symantics as Unix's dlopen....
- *
- */
-#ifndef RTLD_GLOBAL
-#define RTLD_GLOBAL 0
-#endif /* RTLD_GLOBAL */
-#ifndef RTLD_LAZY
-#define RTLD_LAZY 1
-#endif /* RTLD_LAZY */
-#ifndef RTLD_NOW
-#define RTLD_NOW 0
-#endif /* RTLD_NOW */
-
-
-/*
- * Points to Ponder
- *
- * You can load the same DSO more than once, in which case you'll have
- * different image_id's. While this means that we don't have to worry about
- * reference counts, it could lead to problems in the future....
- * richard.
- *
- * load_add_on() apparently does not support lazy or local binding. Need
- * to confirm that the actual behavior is non-lazy/local. --ds
- */
-
-#include
-#include
-
-/* --- functions --- */
-static gpointer
-_g_module_open (const gchar *file_name,
- gboolean bind_lazy,
- gboolean bind_local)
-{
- image_id handle;
-
- handle = load_add_on (file_name);
- if (handle < B_OK)
- {
- gchar *msg = g_strdup_printf ("failed to load_add_on(%s): %s",
- file_name,
- strerror (handle));
-
- g_module_set_error (msg);
- g_free (msg);
-
- return NULL;
- }
-
- return (gpointer) handle;
-}
-
-static gpointer
-_g_module_self (void)
-{
- image_info info;
- int32 cookie = 0;
- status_t status;
-
- /* Is it always the first one? I'm guessing yes. */
- status = get_next_image_info (0, &cookie, &info);
- if (status == B_OK)
- return (gpointer) info.id;
- else
- {
- gchar *msg = g_strdup_printf ("failed to get_next_image_info(self): %s",
- strerror (status));
-
- g_module_set_error (msg);
- g_free (msg);
-
- return NULL;
- }
-}
-
-static void
-_g_module_close (gpointer handle,
- gboolean is_unref)
-{
- image_info info;
- gchar *name;
-
- if (unload_add_on ((image_id) handle) != B_OK)
- {
- gchar *msg;
-
- /* Try and get the name of the image. */
- if (get_image_info ((image_id) handle, &info) != B_OK)
- name = g_strdup ("unknown");
- else
- name = g_strdup (info.name);
-
- msg = g_strdup_printf ("failed to unload_add_on(%s): %s", name, strerror (status));
- g_module_set_error (msg);
- g_free (msg);
- g_free (name);
- }
-}
-
-static gpointer
-_g_module_symbol (gpointer handle,
- const gchar *symbol_name)
-{
- image_id id;
- status_t status;
- image_info info;
- int32 type, name_len;
- void *p;
- gchar *msg, name[256];
- gint n, l;
-
- id = (image_id) handle;
-
- status = get_image_info (id, &info);
- if (status != B_OK)
- {
- msg = g_strdup_printf ("failed to get_image_info(): %s", strerror (status));
- g_module_set_error (msg);
- g_free (msg);
-
- return NULL;
- }
-
- l = strlen (symbol_name);
- name_len = 256;
- type = B_SYMBOL_TYPE_ANY;
- n = 0;
- status = get_nth_image_symbol (id, n, name, &name_len, &type, &p);
- while (status == B_OK)
- {
- if (p && strncmp (name, symbol_name, l) == 0)
- return p;
-
- if (strcmp (name, "_end") == 0)
- {
- msg = g_strdup_printf ("unmatched symbol name '%s'", symbol_name);
- g_module_set_error (msg);
- g_free (msg);
-
- return NULL;
- }
-
- name_len = 256;
- type = B_SYMBOL_TYPE_ANY;
- n++;
- status = get_nth_image_symbol (id, n, name, &name_len, &type, &p);
- }
-
- msg = g_strdup_printf ("failed to get_image_symbol(%s): %s", symbol_name, strerror (status));
- g_module_set_error (msg);
- g_free (msg);
-
- return NULL;
-}
-
-static gchar*
-_g_module_build_path (const gchar *directory,
- const gchar *module_name)
-{
- g_warning ("_g_module_build_path() untested for BeOS!");
-
- if (directory && *directory)
- {
- if (strncmp (module_name, "lib", 3) == 0)
- return g_strconcat (directory, "/", module_name, NULL);
- else
- return g_strconcat (directory, "/lib", module_name, "." G_MODULE_SUFFIX, NULL);
- }
- else if (strncmp (module_name, "lib", 3) == 0)
- return g_strdup (module_name);
- else
- return g_strconcat ("lib", module_name, "." G_MODULE_SUFFIX, NULL);
-}
diff --git a/gmodule/gmoduleconf.h.in b/gmodule/gmoduleconf.h.in
index bdfb2e002..4e3af4ede 100644
--- a/gmodule/gmoduleconf.h.in
+++ b/gmodule/gmoduleconf.h.in
@@ -29,7 +29,6 @@ extern "C" {
#define G_MODULE_IMPL_DL 1
#define G_MODULE_IMPL_DLD 2
#define G_MODULE_IMPL_WIN32 3
-#define G_MODULE_IMPL_BEOS 5
#define G_MODULE_IMPL_DYLD 6
#define G_MODULE_IMPL_AR 7
diff --git a/gmodule/gmoduleconf.h.win32 b/gmodule/gmoduleconf.h.win32
index b0d218135..b047c977b 100644
--- a/gmodule/gmoduleconf.h.win32
+++ b/gmodule/gmoduleconf.h.win32
@@ -29,7 +29,6 @@ extern "C" {
#define G_MODULE_IMPL_DL 1
#define G_MODULE_IMPL_DLD 2
#define G_MODULE_IMPL_WIN32 3
-#define G_MODULE_IMPL_BEOS 5
#define G_MODULE_IMPL_DYLD 6
#define G_MODULE_IMPL G_MODULE_IMPL_WIN32