* oldXMenu/Makefile.in (CPPFLAGS): Explicitly set via configure.

[bpt/emacs.git] / oldXMenu / AddSel.c

diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index 9183aba..07eb1fe 100644 (file)
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -13,12 +13,11 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int
-XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, char *data, char *label, int active, char *help)
-                     
+XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, char *data, char *label, int active, char const *help)
+
                                /* Menu object to be modified. */
                                        /* Pane number to be modified. */
                                        /* Data value. */
@@ -27,10 +26,10 @@ XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, ch
                                        /* Help string */
 {
     register XMPane *pane;     /* Pane containing the new selection. */
-    register XMSelect *select; /* Newly created selection. */
+    register XMSelect *sel;    /* Newly created selection. */
 
 
-    int label_length;          /* Label lenght in characters. */
+    int label_length;          /* Label length in characters. */
     int label_width;           /* Label width in pixels. */
 
     /*
@@ -49,8 +48,8 @@ XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, ch
     /*
      * Calloc the XMSelect structure.
      */
-    select = (XMSelect *)calloc(1, sizeof(XMSelect));
-    if (select == NULL) {
+    sel = (XMSelect *)calloc(1, sizeof(XMSelect));
+    if (sel == NULL) {
        _XMErrorCode = XME_CALLOC;
        return(XM_FAILURE);
     }
@@ -65,27 +64,27 @@ XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, ch
      */
     if (!strcmp (label, "--") || !strcmp (label, "---"))
       {
-       select->type = SEPARATOR;
-       select->active = 0;
+       sel->type = SEPARATOR;
+       sel->active = 0;
       }
     else
       {
-       select->type = SELECTION;
-       select->active = active;
+       sel->type = SELECTION;
+       sel->active = active;
       }
 
-    select->serial = -1;
-    select->label = label;
-    select->label_width = label_width;
-    select->label_length = label_length;
-    select->data = data;
-    select->parent_p = pane;
-    select->help_string = help;
+    sel->serial = -1;
+    sel->label = label;
+    sel->label_width = label_width;
+    sel->label_length = label_length;
+    sel->data = data;
+    sel->parent_p = pane;
+    sel->help_string = help;
 
     /*
      * Insert the selection at the end of the selection list.
      */
-    emacs_insque(select, pane->s_list->prev);
+    emacs_insque(sel, pane->s_list->prev);
 
     /*
      * Update the selection count.
@@ -103,4 +102,3 @@ XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, ch
     _XMErrorCode = XME_NO_ERROR;
     return((pane->s_count - 1));
 }
-