10:33 p.m.
..\src\frame-msw.c(131) : warning C4013: 'Fmake_hash_table' undefined; assuming
extern returning int
..\src\frame-msw.c(132) : error C2115: '=' : incompatible types
terminates compilation under WindowsNT native.
Adrian
XEmacs Build Report as generated
by build-report-version $Revision: 1.53 $ follows:
Contents of c:\export\home\tmp\21.2\xemacs\nt\Installation:
(Output from most recent run of ./configure)
10:46 p.m.
Here's a patch. Completely untested. Please confirm.
I may have broken some other Windows stuff, since I don't have a
Windows development environment, but it should all be relatively easy
to fix.
Martin
>>>> "APA" == Adrian Aichner
<aichner(a)ecf.teradyne.com> writes:
APA> ..\src\frame-msw.c(131) : warning C4013: 'Fmake_hash_table' undefined;
assuming extern returning int
APA> ..\src\frame-msw.c(132) : error C2115: '=' : incompatible types
APA> terminates compilation under WindowsNT native.
1998-12-06 Martin Buchholz <martin(a)xemacs.org>
* frame-msw.c (mswindows_init_frame_1):
- use make_lisp_hash_table, not Fmake_hash_table
- include elhash.h
--- src/frame-msw.c.old
+++ src/frame-msw.c
＠＠ -35,6 +35,7 ＠＠
#include "buffer.h"
#include "console-msw.h"
#include "glyphs-msw.h"
+#include "elhash.h"
#include "events.h"
#include "faces.h"
#include "frame.h"
＠＠ -128,8 +129,8 ＠＠
FRAME_MSWINDOWS_DATA(f)->sizing = 0;
FRAME_MSWINDOWS_MENU_HASH_TABLE(f) = Qnil;
#ifdef HAVE_TOOLBARS
- FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE(f) = Fmake_hash_table (make_int (50),
- Qequal);
+ FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE(f) =
+ make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL);
#endif
/* Will initialize these in WM_SIZE handler. We cannot do it now,
10:08 a.m.
At 14:46 06/12/98 -0800, Martin Buchholz wrote:
Here's a patch. Completely untested. Please confirm.
I may have broken some other Windows stuff, since I don't have a
Windows development environment, but it should all be relatively easy
to fix.
I had to make these fixes as well.
andy
Index: src/console-msw.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/console-msw.c,v
retrieving revision 1.4
diff -u -u -r1.4 console-msw.c
--- src/console-msw.c 1998/04/28 00:24:52 1.4
+++ src/console-msw.c 1998/12/07 17:25:40
＠＠ -89,7 +89,7 ＠＠
return (LRECORDP (obj)) ? XRECORD_LHEADER (obj) : NULL;
}
-int *DOPAQUE_DATA (Lisp_Object obj)
+max_align_t *DOPAQUE_DATA (Lisp_Object obj)
{
return (OPAQUEP (obj)) ? OPAQUE_DATA (XOPAQUE (obj)) : NULL;
}
＠＠ -126,7 +126,7 ＠＠
char *DSYMNAME(Lisp_Object obj)
{
- return (SYMBOLP (obj)) ? XSYMBOL (obj)->name->_data : NULL;
+ return (SYMBOLP (obj)) ? XSYMBOL (obj)->name->data : NULL;
}
#endif
Index: src/menubar-msw.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/menubar-msw.c,v
retrieving revision 1.16.2.2
diff -u -u -r1.16.2.2 menubar-msw.c
--- src/menubar-msw.c 1998/12/05 16:56:04 1.16.2.2
+++ src/menubar-msw.c 1998/12/07 17:26:28
＠＠ -623,7 +623,11 ＠＠
Lisp_Object data, fn, arg, frame;
struct gcpro gcpro1;
+ if (NILP (current_hash_table))
+ return Qnil;
+
data = Fgethash (make_int (id), current_hash_table, Qunbound);
+
if (UNBOUNDP (data))
{
menu_cleanup (f);
Index: src/Makefile.in.in
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/Makefile.in.in,v
retrieving revision 1.81.2.1
diff -u -u -r1.81.2.1 Makefile.in.in
--- src/Makefile.in.in 1998/12/05 16:55:16 1.81.2.1
+++ src/Makefile.in.in 1998/12/07 17:25:40
＠＠ -350,7 +350,7 ＠＠
fastdump: temacs
＠$(RM) ${PROGNAME} && touch SATISFIED
- -${dumpp_temacs}
+ ${dump_temacs}
＠if test -f ${PROGNAME}; then if test -f SATISFIED; then \
./${PROGNAME} -batch -vanilla -f list-load-path-shadows; fi; \
$(RM) SATISFIED; exit 0; fi; \
---------------------------------------------------------------------------
" .sigs are like your face - rarely seen by you and uglier than you think"
Dr Andy Piper, Technical Architect, Parallax Solutions Ltd
mail: andyp(a)parallax.co.uk web: www.parallax.co.uk/~andyp
12:46 a.m.
>>>> "Andy" == Andy Piper
<andyp(a)parallax.co.uk> writes:
Andy> At 14:46 06/12/98 -0800, Martin Buchholz wrote:
Andy> I had to make these fixes as well.
I respectfully veto the console-msw.c part of this patch, and propose
instead this pedantically more correct, completely untested, patch:
1998-12-07 Martin Buchholz <martin(a)xemacs.org>
* console-msw.c (DHEADER):
(DOPAQUE_DATA):
(DEVENT):
(DCONS):
(DCONSCDR):
(DSTRING):
(DVECTOR):
(DSYMBOL):
(DSYMNAME):
- max_align_t should not be visible to the user of the
XOPAQUE_DATA macro.
- use Bufbyte instead of char
- parens around (FOOP (obj)) are always redundant.
If they were necessary, we should fix the macro instead.
- Always use string_data(foo) instead of foo->data.
--- src/opaque.h.old
+++ src/opaque.h
＠＠ -80,7 +80,7 ＠＠
void free_opaque_ptr (Lisp_Object ptr);
#define OPAQUE_SIZE(op) XINT ((op)->size_or_chain)
-#define OPAQUE_DATA(op) ((op)->data)
+#define OPAQUE_DATA(op) ((void *) ((op)->data))
#define OPAQUE_MARKFUN(op) ((op)->markfun)
#define XOPAQUE_SIZE(op) OPAQUE_SIZE (XOPAQUE (op))
#define XOPAQUE_DATA(op) OPAQUE_DATA (XOPAQUE (op))
--- src/console-msw.c.old
+++ src/console-msw.c
＠＠ -84,49 +84,49 ＠＠
* Intended for use in the MSVC "Watch" window which doesn't like
* the aborts that the error_check_foo() functions can make.
*/
-struct lrecord_header *DHEADER(Lisp_Object obj)
+struct lrecord_header *DHEADER (Lisp_Object obj)
{
- return (LRECORDP (obj)) ? XRECORD_LHEADER (obj) : NULL;
+ return LRECORDP (obj) ? XRECORD_LHEADER (obj) : NULL;
}
-int *DOPAQUE_DATA (Lisp_Object obj)
+void *DOPAQUE_DATA (Lisp_Object obj)
{
- return (OPAQUEP (obj)) ? OPAQUE_DATA (XOPAQUE (obj)) : NULL;
+ return OPAQUEP (obj) ? OPAQUE_DATA (XOPAQUE (obj)) : NULL;
}
-struct Lisp_Event *DEVENT(Lisp_Object obj)
+struct Lisp_Event *DEVENT (Lisp_Object obj)
{
- return (EVENTP (obj)) ? XEVENT (obj) : NULL;
+ return EVENTP (obj) ? XEVENT (obj) : NULL;
}
-struct Lisp_Cons *DCONS(Lisp_Object obj)
+struct Lisp_Cons *DCONS (Lisp_Object obj)
{
- return (CONSP (obj)) ? XCONS (obj) : NULL;
+ return CONSP (obj) ? XCONS (obj) : NULL;
}
-struct Lisp_Cons *DCONSCDR(Lisp_Object obj)
+struct Lisp_Cons *DCONSCDR (Lisp_Object obj)
{
- return ((CONSP (obj)) && (CONSP (XCDR (obj)))) ? XCONS (XCDR (obj)) : 0;
+ return (CONSP (obj) && CONSP (XCDR (obj))) ? XCONS (XCDR (obj)) : 0;
}
-char *DSTRING(Lisp_Object obj)
+Bufbyte *DSTRING (Lisp_Object obj)
{
- return (STRINGP (obj)) ? XSTRING_DATA (obj) : NULL;
+ return STRINGP (obj) ? XSTRING_DATA (obj) : NULL;
}
-struct Lisp_Vector *DVECTOR(Lisp_Object obj)
+struct Lisp_Vector *DVECTOR (Lisp_Object obj)
{
- return (VECTORP (obj)) ? XVECTOR (obj) : NULL;
+ return VECTORP (obj) ? XVECTOR (obj) : NULL;
}
-struct Lisp_Symbol *DSYMBOL(Lisp_Object obj)
+struct Lisp_Symbol *DSYMBOL (Lisp_Object obj)
{
- return (SYMBOLP (obj)) ? XSYMBOL (obj) : NULL;
+ return SYMBOLP (obj) ? XSYMBOL (obj) : NULL;
}
-char *DSYMNAME(Lisp_Object obj)
+Bufbyte *DSYMNAME (Lisp_Object obj)
{
- return (SYMBOLP (obj)) ? XSYMBOL (obj)->name->_data : NULL;
+ return SYMBOLP (obj) ? string_data (XSYMBOL (obj)->name) : NULL;
}
#endif
9474
days inactive
9476
days old
3 comments
3 participants
participants (3)
-
Adrian Aichner -
Andy Piper -
Martin Buchholz