Mercurial > hg > xemacs-beta
comparison src/bytecode.c @ 5091:ed624ab64583
fix compile errors/warnings
-------------------- ChangeLog entries follow: --------------------
lib-src/ChangeLog addition:
2010-03-02 Ben Wing <ben@xemacs.org>
* digest-doc.c:
* make-path.c:
`emacs' isn't defined, but HAVE_CONFIG_H is, so use it to get
config.h.
* getopt.h:
Conditionalize on HAVE_CONFIG_H to get real prototypes.
src/ChangeLog addition:
2010-03-02 Ben Wing <ben@xemacs.org>
* Makefile.in.in:
* Makefile.in.in (objs):
glyphs-shared.o, glyphs-eimage.o only needed when HAVE_WINDOW_SYSTEM.
glyphs-widget.o should be too, but we need a bit of work ifdeffing
out the subwindow stuff from redisplay.c et al.
* bytecode.c (init_opcode_table_multi_op):
Change var name to avoid shadowing with `basename'.
* emacs.c (main_1):
Don't call init/etc. routines for glyphs-shared, glyphs-eimage unless
HAVE_WINDOW_SYSTEM is defined.
* linuxplay.c:
* linuxplay.c (sighandler):
* vdb-posix.c (vdb_fault_handler):
Use const for variables holding string constants to avoid C++
warnings.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 02 Mar 2010 05:22:10 -0600 |
| parents | fe0d3106cc36 |
| children | 4a6b680a9577 |
comparison
equal
deleted
inserted
replaced
| 5083:88f955fa5a7f | 5091:ed624ab64583 |
|---|---|
| 2821 plus an offset (except for Bconstant). */ | 2821 plus an offset (except for Bconstant). */ |
| 2822 | 2822 |
| 2823 static void | 2823 static void |
| 2824 init_opcode_table_multi_op (Opcode op) | 2824 init_opcode_table_multi_op (Opcode op) |
| 2825 { | 2825 { |
| 2826 const Ascbyte *basename = opcode_name_table[op]; | 2826 const Ascbyte *base = opcode_name_table[op]; |
| 2827 Ascbyte temp[300]; | 2827 Ascbyte temp[300]; |
| 2828 int i; | 2828 int i; |
| 2829 | 2829 |
| 2830 for (i = 1; i < 7; i++) | 2830 for (i = 1; i < 7; i++) |
| 2831 { | 2831 { |
| 2832 assert (!opcode_name_table[op + i]); | 2832 assert (!opcode_name_table[op + i]); |
| 2833 sprintf (temp, "%s+%d", basename, i); | 2833 sprintf (temp, "%s+%d", base, i); |
| 2834 opcode_name_table[op + i] = xstrdup (temp); | 2834 opcode_name_table[op + i] = xstrdup (temp); |
| 2835 } | 2835 } |
| 2836 } | 2836 } |
| 2837 | 2837 |
| 2838 #endif /* ERROR_CHECK_BYTE_CODE */ | 2838 #endif /* ERROR_CHECK_BYTE_CODE */ |