CVS update by crestani xemacs/src, process-unix.c ...
xemacs-cvs at xemacs.org
xemacs-cvs at xemacs.org
Fri Aug 17 04:04:36 EDT 2007
User: crestani
Date: 07/08/17 10:04:36
Modified: xemacs/src ChangeLog input-method-xlib.c lisp.h
process-unix.c vdb.c
Log:
2007-08-15 Marcus Crestani <crestani at xemacs.org>
* input-method-xlib.c (EmacsFreeXIMStyles):
* lisp.h:
* process-unix.c (connect_to_file_descriptor):
* process-unix.c (create_bidirectional_pipe):
* process-unix.c (unix_create_process):
* process-unix.c (unix_open_network_stream):
* process-unix.c (unix_open_multicast_group): Convert pointers to
EMACS_INTs instead of ints.
* vdb.c (Ftest_vdb): Print adresses as pointers.
Revision Changes Path
1.1086 +12 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1085
retrieving revision 1.1086
diff -u -p -r1.1085 -r1.1086
--- ChangeLog 2007/08/17 08:01:13 1.1085
+++ ChangeLog 2007/08/17 08:04:25 1.1086
@@ -1,3 +1,15 @@
+2007-08-15 Marcus Crestani <crestani at xemacs.org>
+
+ * input-method-xlib.c (EmacsFreeXIMStyles):
+ * lisp.h:
+ * process-unix.c (connect_to_file_descriptor):
+ * process-unix.c (create_bidirectional_pipe):
+ * process-unix.c (unix_create_process):
+ * process-unix.c (unix_open_network_stream):
+ * process-unix.c (unix_open_multicast_group): Convert pointers to
+ EMACS_INTs instead of ints.
+ * vdb.c (Ftest_vdb): Print adresses as pointers.
+
2007-08-14 Marcus Crestani <crestani at xemacs.org>
* s/sol2.h: Fix for GCC lossage not needed with SunOS 5.10.
1.23 +1 -1 XEmacs/xemacs/src/input-method-xlib.c
Index: input-method-xlib.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/input-method-xlib.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- input-method-xlib.c 2006/06/19 18:19:37 1.22
+++ input-method-xlib.c 2007/08/17 08:04:27 1.23
@@ -713,7 +713,7 @@ EmacsFreeXIMStyles (
if (converter_data)
{
- Boolean free_p = (Boolean) (int) converter_data;
+ Boolean free_p = (Boolean) (EMACS_INT) converter_data;
XIMStyles *styles = (XIMStyles *) toVal->addr;
if (free_p)
XFree ( styles->supported_styles );
1.147 +1 -1 XEmacs/xemacs/src/lisp.h
Index: lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- lisp.h 2007/08/04 20:00:23 1.146
+++ lisp.h 2007/08/17 08:04:27 1.147
@@ -1331,7 +1331,7 @@ struct console_type_entry;
/* This is shared by process.h, events.h and others in future.
See events.h for description */
-typedef unsigned int USID;
+typedef unsigned EMACS_INT USID;
typedef int face_index;
typedef int glyph_index;
typedef struct lstream Lstream; /* lstream.h */
1.60 +12 -12 XEmacs/xemacs/src/process-unix.c
Index: process-unix.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process-unix.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- process-unix.c 2007/06/22 17:50:42 1.59
+++ process-unix.c 2007/08/17 08:04:28 1.60
@@ -174,7 +174,7 @@ connect_to_file_descriptor (Lisp_Object
{
/* This function can GC */
Lisp_Object proc;
- int inch;
+ EMACS_INT inch;
CHECK_STRING (name);
CHECK_INT (infd);
@@ -424,8 +424,8 @@ allocate_pty_the_old_fashioned_way (void
}
static int
-create_bidirectional_pipe (int *inchannel, int *outchannel,
- volatile int *forkin, volatile int *forkout)
+create_bidirectional_pipe (EMACS_INT *inchannel, EMACS_INT *outchannel,
+ volatile EMACS_INT *forkin, volatile EMACS_INT *forkout)
{
int sv[2];
@@ -1055,13 +1055,13 @@ unix_create_process (Lisp_Process *p,
int separate_err)
{
int pid;
- int inchannel = -1;
- int outchannel = -1;
- int errchannel = -1;
+ EMACS_INT inchannel = -1;
+ EMACS_INT outchannel = -1;
+ EMACS_INT errchannel = -1;
/* Use volatile to protect variables from being clobbered by longjmp. */
- volatile int forkin = -1;
- volatile int forkout = -1;
- volatile int forkerr = -1;
+ volatile EMACS_INT forkin = -1;
+ volatile EMACS_INT forkout = -1;
+ volatile EMACS_INT forkerr = -1;
volatile int pty_flag = 0;
if (!NILP (Vprocess_connection_type))
@@ -1884,8 +1884,8 @@ unix_open_network_stream (Lisp_Object na
Lisp_Object service, Lisp_Object protocol,
void **vinfd, void **voutfd)
{
- int inch;
- int outch;
+ EMACS_INT inch;
+ EMACS_INT outch;
volatile int s = -1;
volatile int port;
volatile int retry = 0;
@@ -2162,7 +2162,7 @@ unix_open_multicast_group (Lisp_Object n
struct ip_mreq imr;
struct sockaddr_in sa;
struct protoent *udp;
- int ws, rs;
+ EMACS_INT ws, rs;
int theport;
unsigned char thettl;
int one = 1; /* For REUSEADDR */
1.4 +6 -7 XEmacs/xemacs/src/vdb.c
Index: vdb.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/vdb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vdb.c 2007/08/15 11:06:10 1.3
+++ vdb.c 2007/08/17 08:04:28 1.4
@@ -90,9 +90,8 @@ Test virtual dirty bit implementation. P
protection of PROT_READ|PROT_WRITE. */
p = (Rawbyte *) mc_alloc (mc_get_page_size());
set_lheader_implementation ((struct lrecord_header *) p, &lrecord_cons);
- fprintf (stderr, "Allocate p: [%x ... %x], length %d\n",
- (int) p, (int) (p + mc_get_page_size ()),
- (int) mc_get_page_size ());
+ fprintf (stderr, "Allocate p: [%p ... %p], length %d\n",
+ p, p + mc_get_page_size (), (int) mc_get_page_size ());
/* Test read. */
fprintf (stderr, "Attempt to read p[666]... ");
@@ -126,11 +125,11 @@ Test virtual dirty bit implementation. P
vdb_unprotect (p, mc_get_page_size ());
for (count = Dynarr_length (page_fault_table); count; count--)
if (Dynarr_at (page_fault_table, count - 1) == &p[666])
- fprintf (stderr, "VALID page fault at %x\n",
- (int) Dynarr_at (page_fault_table, count - 1));
+ fprintf (stderr, "VALID page fault at %p\n",
+ Dynarr_at (page_fault_table, count - 1));
else
- fprintf (stderr, "WRONG page fault at %x\n",
- (int) Dynarr_at (page_fault_table, count - 1));
+ fprintf (stderr, "WRONG page fault at %p\n",
+ Dynarr_at (page_fault_table, count - 1));
Dynarr_free (page_fault_table);
return Qnil;
}
More information about the XEmacs-CVS
mailing list