GNOME.org
 

[glib] Remove alleged support for BeOS

commit 51a917bc1656368e8d94ea7ea3b33d3cc06daa82
Author: Dan Winship <danw gnome org>
Date:   Sat Oct 19 13:03:55 2013 -0400

    Remove alleged support for BeOS
    
    Since the initial addition of BeOS support in 1999, there has only
    been one update to it (in 2005, and it wasn't even very big). GLib is
    known to not currently build on Haiku (or presumably actual BeOS)
    without additional patching, and the fact that there isn't a single
    G_OS_BEOS check in gio/ is suspicious.
    
    Additionally, other than the GModule implementation, all of the
    existing G_OS_BEOS checks are either (a) "G_OS_UNIX || G_OS_BEOS", or
    (b) random minor POSIXy tweaks (include this header file rather than
    that one, etc), suggesting that if we were going to support Haiku, it
    would probably be simpler to treat it as a special kind of G_OS_UNIX
    (as we do with Mac OS X) rather than as its own completely different
    thing.
    
    So, kill G_OS_BEOS.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=710519

 configure.ac                          |   32 -----
 docs/reference/glib/glib-sections.txt |    1 -
 glib/docs.c                           |    7 -
 glib/gbacktrace.c                     |    2 +-
 glib/gmain.c                          |    5 -
 glib/gpoll.c                          |    4 -
 glib/gstdio.c                         |    2 +-
 glib/gutils.c                         |    2 +-
 gmodule/Makefile.am                   |    1 -
 gmodule/gmodule-beos.c                |  204 ---------------------------------
 gmodule/gmoduleconf.h.in              |    1 -
 gmodule/gmoduleconf.h.win32           |    1 -
 12 files changed, 3 insertions(+), 259 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index deacdc1..26a9cd8 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 c44219f..ae5df60 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -130,7 +130,6 @@ GLIB_DISABLE_DEPRECATION_WARNINGS
 <FILE>macros</FILE>
 <SUBSECTION>
 G_OS_WIN32
-G_OS_BEOS
 G_OS_UNIX
 
 <SUBSECTION>
diff --git a/glib/docs.c b/glib/docs.c
index c7ae282..6b4d7d6 100644
--- a/glib/docs.c
+++ b/glib/docs.c
@@ -1540,13 +1540,6 @@
  */
 
 /**
- * G_OS_BEOS:
- *
- * This macro is defined only on BeOS. So you can bracket
- * BeOS-specific code in "&num;ifdef G_OS_BEOS".
- */
-
-/**
  * G_OS_UNIX:
  *
  * This macro is defined only on UNIX. So you can bracket
diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index 9117804..a9451c8 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 608c1a5..ad25707 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -73,11 +73,6 @@
 #include <windows.h>
 #endif /* G_OS_WIN32 */
 
-#ifdef G_OS_BEOS
-#include <sys/socket.h>
-#include <sys/wait.h>
-#endif /* G_OS_BEOS */
-
 #include "gmain.h"
 
 #include "garray.h"
diff --git a/glib/gpoll.c b/glib/gpoll.c
index 940abae..601381a 100644
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -359,10 +359,6 @@ g_poll (GPollFD *fds,
 #include <sys/select.h>
 #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 cca4ff5..a78558f 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 ada9065..3b8d3ee 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 4b68b3d..e71270c 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/gmoduleconf.h.in b/gmodule/gmoduleconf.h.in
index bdfb2e0..4e3af4e 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 b0d2181..b047c97 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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]