1.0.39.12: remove darwin-langinfo

* remove darwin-langinfo.c/h from Config.*-darwin and grovel-headers.c * revert explicit setting of *default-c-string-external-format* to latin-1 in sb-posix test.
gsorbier · Jun 12, 2010 · 7c75cd3 · 7c75cd3
1 parent 0c4fe8f
commit 7c75cd3
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 77 deletions.
diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
@@ -508,8 +508,7 @@
  nil)
 
 (deftest readdir.1
- (let ((dir (sb-posix:opendir "/"))
- (sb-alien::*default-c-string-external-format* :latin-1))
+ (let ((dir (sb-posix:opendir "/")))
  (unwind-protect
  (block dir-loop
  (loop for dirent = (sb-posix:readdir dir)

diff --git a/src/runtime/Config.ppc-darwin b/src/runtime/Config.ppc-darwin
@@ -12,7 +12,7 @@
 CFLAGS = -g -Wall -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
 LINKFLAGS += -mmacosx-version-min=10.4
 
-OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c darwin-langinfo.c
+OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c
 ifdef LISP_FEATURE_DLSHIM
  OS_SRC += darwin-dlshim.c
 endif

diff --git a/src/runtime/Config.x86-64-darwin b/src/runtime/Config.x86-64-darwin
@@ -21,7 +21,7 @@ ifdef LISP_FEATURE_INODE64
 CFLAGS += -D_DARWIN_USE_64_BIT_INODE
 endif
 
-OS_SRC = bsd-os.c x86-64-bsd-os.c darwin-os.c x86-64-darwin-os.c darwin-langinfo.c
+OS_SRC = bsd-os.c x86-64-bsd-os.c darwin-os.c x86-64-darwin-os.c
 ifdef LISP_FEATURE_DLSHIM
  OS_SRC += darwin-dlshim.c
 endif

diff --git a/src/runtime/Config.x86-darwin b/src/runtime/Config.x86-darwin
@@ -19,7 +19,7 @@ CFLAGS += -mmacosx-version-min=10.4
 LINKFLAGS += -mmacosx-version-min=10.4
 endif
 
-OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c darwin-langinfo.c
+OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c
 ifdef LISP_FEATURE_DLSHIM
  OS_SRC += darwin-dlshim.c
 endif

diff --git a/src/runtime/darwin-langinfo.c b/src/runtime/darwin-langinfo.c
diff --git a/src/runtime/darwin-langinfo.h b/src/runtime/darwin-langinfo.h
diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
@@ -36,11 +36,7 @@
  #include <sys/wait.h>
  #include <sys/ioctl.h>
  #include <sys/termios.h>
- #ifdef LISP_FEATURE_DARWIN
- #include "../src/runtime/darwin-langinfo.h"
- #else
- #include <langinfo.h>
- #endif
+ #include <langinfo.h>
  #ifdef LISP_FEATURE_DLSHIM
  #include "../src/runtime/darwin-dlshim.h"
  #else

diff --git a/version.lisp-expr b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.39.11"
+"1.0.39.12"