--- guile-1.8.8.orig/libguile/fports.c
+++ guile-1.8.8/libguile/fports.c
@@ -78,8 +78,8 @@
 #define OFF_T_MAX  LONG_MAX
 #define OFF_T_MIN  LONG_MIN
 #elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
-#define OFF_T_MAX  LONG_LONG_MAX
-#define OFF_T_MIN  LONG_LONG_MIN
+#define OFF_T_MAX  LLONG_MAX
+#define OFF_T_MIN  LLONG_MIN
 #else
 #error Oops, unknown OFF_T size
 #endif
--- guile-1.8.8.orig/libguile/gc_os_dep.c
+++ guile-1.8.8/libguile/gc_os_dep.c
@@ -1459,7 +1459,7 @@
 #     undef __KERNEL__
 #  endif
 
-#  else
+#  elif defined(__GLIBC__)
 
       /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
       /* struct sigcontext.  libc6 (glibc2) uses "struct sigcontext" in     */