aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/boot/ast.boot4
-rw-r--r--src/boot/strap/ast.clisp4
-rw-r--r--src/include/open-axiom.h2
4 files changed, 9 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b1d21a93..9cecbe00 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
2012-08-18 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * boot/ast.boot (genSBCLnativeTranslation): Do no prepend an
+ underbar when WIN32 (no longer necessary.)
+ * include/open-axiom.h (OPENAXIOM_EXPORT): Fix thino.
+
+2012-08-18 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* include/sockio.h (connect_to_local_server): First parameter now
const char*.
* include/pixmap.h (zzopen): Second parameter now const char*.
diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index 8d5a6d57..fdbb1296 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -1854,9 +1854,7 @@ genSBCLnativeTranslation(op,s,t,op') ==
if needsStableReference? x then
unstableArgs := [a,:unstableArgs]
- op' :=
- %hasFeature KEYWORD::WIN32 => strconc('"__",symbolName op')
- symbolName op'
+ op' := symbolName op'
unstableArgs = nil =>
[["DEFUN",op,args,
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index eea10d77..fdd34743 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -3578,9 +3578,7 @@
(SETQ |unstableArgs| (CONS |a| |unstableArgs|))))))
(SETQ |bfVar#7| (CDR |bfVar#7|))
(SETQ |bfVar#8| (CDR |bfVar#8|))))
- (SETQ |op'|
- (COND ((|%hasFeature| :WIN32) (CONCAT "_" (SYMBOL-NAME |op'|)))
- (T (SYMBOL-NAME |op'|))))
+ (SETQ |op'| (SYMBOL-NAME |op'|))
(COND
((NULL |unstableArgs|)
(LIST
diff --git a/src/include/open-axiom.h b/src/include/open-axiom.h
index 53b24d65..0b581a67 100644
--- a/src/include/open-axiom.h
+++ b/src/include/open-axiom.h
@@ -50,7 +50,7 @@
#ifdef __WIN32__
# ifdef DLL_EXPORT
# define OPENAXIOM_EXPORT __declspec(dllexport)
-# elif defined(OPENAXIOM_DLL_IMPORT)
+# elif defined(DLL_IMPORT)
# define OPENAXIOM_EXPORT __declspec(dllimport)
# endif /* DLL_EXPORT */
# ifndef WIN32_LEAN_AND_MEAN