Re: Mingw32 build problem with getloadavg
mea culpa.
Index: ChangeLog
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.154.2.667
diff -u -r1.154.2.667 ChangeLog
--- ChangeLog 2000/08/07 09:15:09 1.154.2.667
+++ ChangeLog 2000/08/08 08:23:38
＠＠ -1,3 +1,13 ＠＠
+2000-08-07 Ben Wing <ben(a)xemacs.org>
+
+ * getloadavg.c: remove duplicate (and windows-breaking)
+ includes of fcntl.h and sys/file.h.
+
+ * nt.c: remove duplicate getloadavg() definition.
+
+ * sysdll.h (Qdll_filename_encoding): add missing stand-in
+ encodings.
+
2000-08-07 Gunnar Evermann <ge204(a)eng.cam.ac.uk>
* eval.c (function_argcount): If function needs to be autoloaded
Index: getloadavg.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/getloadavg.c,v
retrieving revision 1.13.2.7
diff -u -r1.13.2.7 getloadavg.c
--- getloadavg.c 2000/08/06 09:27:14 1.13.2.7
+++ getloadavg.c 2000/08/08 08:23:38
＠＠ -437,11 +437,6 ＠＠
#include <sys/pstat.h>
#endif /* HAVE_SYS_PSTAT_H (on HPUX) */
-#if defined(HAVE_FCNTL_H) || defined(_POSIX_VERSION)
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-#endif
/* Avoid static vars inside a function since in HPUX they dump as pure. */
Index: nt.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/nt.c,v
retrieving revision 1.17.2.22
diff -u -r1.17.2.22 nt.c
--- nt.c 2000/08/06 09:27:20 1.17.2.22
+++ nt.c 2000/08/08 08:23:39
＠＠ -69,20 +69,6 ＠＠
#endif
}
-/* Emulate getloadavg. */
-int
-getloadavg (double loadavg[], int nelem)
-{
- int i;
-
- /* A faithful emulation is going to have to be saved for a rainy day. */
- for (i = 0; i < nelem; i++)
- {
- loadavg[i] = 0.0;
- }
- return i;
-}
-
/* Emulate getpwuid, getpwnam and others. */
#define PASSWD_FIELD_SIZE 256
Index: sysdll.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/sysdll.h,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 sysdll.h
--- sysdll.h 2000/06/12 04:18:25 1.2.2.3
+++ sysdll.h 2000/08/08 08:23:39
＠＠ -50,4 +50,9 ＠＠
}
#endif
+/* More stand-ins ... */
+
+#define Qdll_filename_encoding Qfile_name
+#define Qdll_function_name_encoding Qnative
+
#endif /* INCLUDED_sysdll_h_ */
? obj
Index: ChangeLog
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/nt/ChangeLog,v
retrieving revision 1.41.2.109
diff -u -r1.41.2.109 ChangeLog
--- ChangeLog 2000/08/06 09:27:00 1.41.2.109
+++ ChangeLog 2000/08/08 08:24:28
＠＠ -1,3 +1,7 ＠＠
+2000-08-07 Ben Wing <ben(a)xemacs.org>
+
+ * xemacs.mak: add getloadavg.c.
+
2000-07-30 Ben Wing <ben(a)xemacs.org>
* README (NOTE):
Index: xemacs.mak
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/nt/xemacs.mak,v
retrieving revision 1.41.2.56
diff -u -r1.41.2.56 xemacs.mak
--- xemacs.mak 2000/07/21 10:15:33 1.41.2.56
+++ xemacs.mak 2000/08/08 08:24:28
＠＠ -667,6 +667,7 ＠＠
$(SRC)\font-lock.c \
$(SRC)\frame.c \
$(SRC)\general.c \
+ $(SRC)\getloadavg.c \
$(SRC)\glyphs.c \
$(SRC)\glyphs-eimage.c \
$(SRC)\glyphs-widget.c \
＠＠ -952,6 +953,7 ＠＠
$(OUTDIR)\font-lock.obj \
$(OUTDIR)\frame.obj \
$(OUTDIR)\general.obj \
+ $(OUTDIR)\getloadavg.obj \
$(OUTDIR)\glyphs.obj \
$(OUTDIR)\glyphs-eimage.obj \
$(OUTDIR)\glyphs-widget.obj \
Andrew Begel wrote:
I just checked out the latest XEmacs 21.2 from CVS and am trying to compile
it for Mingw (./configure i586-pc-mingw32) under Win2k.
When I link temacs, I get this error:
gcc -g -O3 -Wall -Wno-switch -Wpointer-arith -Winline -Wmissing-prototypes
-Wshadow -Wl,-export-dynamic -I/cygdrive/c/xemacs/xemacs-21.2/src -o
temacs abbrev.o alloc.o blocktype.o buffer.o bytecode.o callint.o
callproc.o casefiddle.o casetab.o chartab.o cmdloop.o cmds.o console.o
console-stream.o data.o device.o dired.o doc.o doprnt.o dynarr.o editfns.o
elhash.o emacs.o eval.o events.o debug.o
tests.o filelock.o ntplay.o nt.o ntheap.o ntproc.o dired-msw.o unexcw.o
crollbar-msw.o menubar-msw.o toolbar-msw.o dialog-msw.o console-msw.o
device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o
redisplay-msw.o glyphs-msw.o gui-msw.o dgif_lib.o gif_io.o menubar.o
scrollbar.o dialog.o toolbar.o file-coding.o realpath.o getloadavg.o
inline.o sysdll.o emodules.o process-nt.o event-stream.o extents.o faces.o
fileio.o filemode.o floatfns.o fns.o font-lock.o frame.o eneral.o glyphs.o
glyphs-eimage.o glyphs-widget.o gui.o gutter.o hash.o imgproc.o indent.o
insdel.o intl.o keymap.o line-number.o lread.o lstream.o macros.o marker.o
md5.o minibuf.o objects.o opaque.o print.o process.o profile.o rangetab.o
redisplay.o redisplay-output.o regex.o search.o select.o sheap.o signal.o
sound.o specifier.o strftime.o symbols.o syntax.o sysdep.o undo.o widget.o
window.o win32.o xemacs_res.o lastfile.o gmalloc.o free-hook.o vm-limit.o
-ltiff -ljpeg -lz -mno-cygwin -mwindows -lwinmm -lwsock32 -lshell32 -lgdi32
-luser32 -lcomdlg32 -lcomctl32 -lwinspool
getloadavg.o: In function `getloadavg':
/cygdrive/c/xemacs/xemacs-21.2/src/getloadavg.c:493: multiple definition of
`getloadavg'
nt.o:/cygdrive/c/xemacs/xemacs-21.2/src/nt.c:75: first defined here
collect2: ld returned 1 exit status
make[1]: *** [temacs] Error 1
make[1]: Leaving directory `/cygdrive/c/xemacs/xemacs-21.2/src'
make: *** [src] Error 2
[16:11:42] /xemacs/xemacs-21.2> xe
Which definition is better? The one in nt.c is quite small, whereas the one
in getloadavg.c seems to be doing quite a bit more.
I commented out the small one in nt.c without seemingly ill effects.
Andrew
--
Ben
In order to save my hands, I am cutting back on my mail. I also write
as succinctly as possible -- please don't be offended. If you send me
mail, you _will_ get a response, but please be patient, especially for
XEmacs-related mail. If you need an immediate response and it is not
apparent in your message, please say so. Thanks for your understanding.
See also http://www.666.com/ben/chronic-pain/