*** empty log message ***

[gnu-emacs] / lwlib / lwlib-utils.c

diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index c966e9645e5cc5bf8f8dbc4f6316402b27f33850..cd7c9c540f2fce5eae068556f73448a404d636cf 100644 (file)
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -15,7 +15,19 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* Definitions of these in config.h can cause
+   declaration conflicts later on between declarations for index
+   and declarations for strchr.  This file doesn't use
+   index and rindex, so cancel them.  */
+#undef index
+#undef rindex
 
 #include <X11/Xatom.h>
 #include <X11/IntrinsicP.h>
@@ -63,7 +75,7 @@ XtApplyToWidgets (w, proc, arg)
       int nkids = cw->composite.num_children;
       Widget *kids = (Widget *) malloc (sizeof (Widget) * nkids);
       int i;
-      bcopy (cw->composite.children, kids, sizeof (Widget) * nkids);
+      lwlib_bcopy (cw->composite.children, kids, sizeof (Widget) * nkids);
       for (i = 0; i < nkids; i++)
 /* This prevent us from using gadgets, why is it here? */
 /*     if (XtIsWidget (kids [i])) */