From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 Mar 2002 09:39:48 +0000 (+0000)
Subject: (P_): Don't define if already defined.
X-Git-Tag: ttn-vms-21-2-B4~16142
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=663671d5a82dc8514e055e248294c1ef4b394342;p=emacs.git

(P_): Don't define if already defined.
---

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index ff9da719924..f3cbbe51454 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* lwlib.c (P_): Don't define if already defined.
+
 2002-01-27  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
 	* lwlib-Xaw.c (xaw_update_scrollbar, xaw_scrollbar_scroll)
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index bf542f36f52..f7e68925c9c 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -75,11 +75,13 @@ char *lwlib_toolkit_type = "motif";
 char *lwlib_toolkit_type = "lucid";
 #endif
 
+#ifndef P_
 #if defined __STDC__ || defined PROTOTYPES
 #define P_(x)	x
 #else
 #define P_(x)	()
 #endif
+#endif
 
 static widget_value *merge_widget_value P_ ((widget_value *,
 					     widget_value *,