Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[gnu-emacs] / oldXMenu / X10.h

diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h
index 63bf90f38d26439b96fde875385462ca031bfa79..5e4ca068ba5544e94294fabf3108bb1d6522db39 100644 (file)
--- a/oldXMenu/X10.h
+++ b/oldXMenu/X10.h
@@ -15,7 +15,6 @@
  *
  */
 
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  *     X10.h - Header definition and support file for the C subroutine
@@ -52,10 +51,10 @@ XDrawFilled so it shouldn't be defined.
  */
 typedef struct _XAssoc {
        struct _XAssoc *next;   /* Next object in this bucket. */
-       struct _XAssoc *prev;   /* Previous obejct in this bucket. */
+       struct _XAssoc *prev;   /* Previous object in this bucket. */
        Display *display;       /* Display which owns the id. */
        XID x_id;               /* X Window System id. */
-       char *data;             /* Pointer to untyped memory. */
+       void *data;             /* Pointer to untyped memory. */
 } XAssoc;
 
 /*
@@ -72,10 +71,7 @@ typedef struct {
     int size;                  /* Table size (number of buckets). */
 } XAssocTable;
 
-XAssocTable *XCreateAssocTable();
-char *XLookUpAssoc();
+XAssocTable *XCreateAssocTable(int size);
+char *XLookUpAssoc(Display *dpy, XAssocTable *table, XID x_id);
 
 #endif /* _X10_H_ */
-
-/* arch-tag: b0b749fb-757b-470b-b405-af7d033a5aad
-   (do not change this comment) */