Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
clim-tos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alastair Bridgewater
clim-tos
Commits
8b573560
Commit
8b573560
authored
15 years ago
by
Kevin Layer
Browse files
Options
Downloads
Plain Diff
resolve conflicts
parents
e78fcfb3
0602124a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog.n
+5
-0
5 additions, 0 deletions
ChangeLog.n
utils/lisp-utilities.lisp
+6
-3
6 additions, 3 deletions
utils/lisp-utilities.lisp
with
11 additions
and
3 deletions
ChangeLog.n
+
5
−
0
View file @
8b573560
...
...
@@ -4,6 +4,11 @@ don't forget to change the version in utils/packages.lisp if you do anything
user visible.
*******************************************************************************
2009-10-27 Andreas Fuchs <afuchs@franz.com>
* utils/lisp-utils.lisp: Use excl:free and excl:malloc everywhere
to avoid a crash on international lisps.
2009-10-08 Kevin Layer <layer@gemini.franz.com>
* Makefile.generic: bug18656: smpcompat workaround
...
...
This diff is collapsed.
Click to expand it.
utils/lisp-utilities.lisp
+
6
−
3
View file @
8b573560
...
...
@@ -1659,7 +1659,7 @@
;;;
;;; This is here to limit need for FF package to compile time.
(
defun
system-free
(
x
)
(
excl:
acl
free
x
))
(
defun
system-free
(
x
)
(
excl:free
x
))
;;; ALLOCATE-CSTRUCT was adapted from ff:make-cstruct.
;;; We aren't using ff:make-cstruct because it uses excl:aclmalloc.
...
...
@@ -1678,7 +1678,7 @@
(
defun
allocate-memory
(
size
init
)
;; Used only by ALLOCATE-CSTRUCT.
(
let
((
pointer
(
excl:
acl
malloc
size
)))
(
let
((
pointer
(
excl:malloc
size
)))
(
when
init
(
do
((
i
0
(
+
i
#-
64bit
4
#+
64bit
8
)))
((
>=
i
size
))
...
...
@@ -1688,6 +1688,9 @@
;;; We aren't using excl:string-to-native by default because it uses
;;; excl:aclmalloc.
;;; aclmalloc is bad because Motif tries to free certain values
;;; itself, and will then crash and burn if they were allocated with
;;; aclmalloc.
;; This now uses the slightly slower (locale-correct) way of
;; converting to octets first, then copying to foreign space.
(
defun
string-to-foreign
(
string
&optional
address
)
...
...
@@ -1703,7 +1706,7 @@
(
length
(
length
octets
)))
(
declare
(
optimize
(
safety
0
))
(
type
fixnum
length
))
(
setf
address
(
excl:
acl
malloc
length
))
(
setf
address
(
excl:malloc
length
))
(
dotimes
(
i
length
)
(
declare
(
fixnum
i
))
(
setf
(
sys:memref-int
address
0
i
:unsigned-byte
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment