Fix works on FreeWnn-server and 64bit-emacs.

PR:		ports/113755
Submitted by:	Nobuhiro Ban <ban.nobuhiro@gmail.com>
This commit is contained in:
Andrey Slusar 2007-06-22 18:43:45 +00:00
parent 265d63bee9
commit 0a30e86178
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=194092
4 changed files with 44 additions and 0 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= tamago
PORTVERSION= ${EGG_DEBIAN_VER}
PORTREVISION= 1
CATEGORIES= editors elisp
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/e/egg

View file

@ -0,0 +1,21 @@
--- egg/wnnrpc.el Sat Jun 16 23:30:29 2007
+++ egg/wnnrpc.el Sat Jun 16 23:29:00 2007
@@ -714,8 +714,14 @@
,send-expr ,@rcv-exprs))
(defmacro wnnrpc-get-result (&rest body)
- `(let (result)
- (comm-unpack (u) result)
+ `(let (result resulth)
+ (comm-unpack (w w) resulth result)
+ (cond ((and (= result 65535) (= resulth 65535))
+ (setq result -1))
+ ((= resulth (lsh (lsh resulth 16) -16))
+ (setq result (+ (lsh resulth 16) result)))
+ (t
+ (error "overflow")))
(if (< result 0)
(progn
(comm-unpack (u) result)

View file

@ -7,6 +7,7 @@
PORTNAME= tamago
PORTVERSION= ${EGG_DEBIAN_VER}
PORTREVISION= 1
CATEGORIES= editors elisp
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/e/egg

View file

@ -0,0 +1,21 @@
--- egg/wnnrpc.el Sat Jun 16 23:30:29 2007
+++ egg/wnnrpc.el Sat Jun 16 23:29:00 2007
@@ -714,8 +714,14 @@
,send-expr ,@rcv-exprs))
(defmacro wnnrpc-get-result (&rest body)
- `(let (result)
- (comm-unpack (u) result)
+ `(let (result resulth)
+ (comm-unpack (w w) resulth result)
+ (cond ((and (= result 65535) (= resulth 65535))
+ (setq result -1))
+ ((= resulth (lsh (lsh resulth 16) -16))
+ (setq result (+ (lsh resulth 16) result)))
+ (t
+ (error "overflow")))
(if (< result 0)
(progn
(comm-unpack (u) result)