Merge from emacs-24; up to 2012-12-26T16:22:18Z!michael.albinus@gmx.de

[bpt/emacs.git] / oldXMenu / X10.h

diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h
index 9a7766b..5e4ca06 100644 (file)
--- a/oldXMenu/X10.h
+++ b/oldXMenu/X10.h
@@ -51,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;
 
 /*
@@ -75,6 +75,3 @@ 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) */