Remove leftover P_ macros.

* lib-src/update-game-score.c (P_): Remove macro.
* lib-src/ebrowse.c: Remove include guards.
(P_): Remove macro.

3 files changed, 6 insertions, 19 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a1479dc2698..aa9fab0badb 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * update-game-score.c (P_): Remove macro.
+        * ebrowse.c: Remove include guards.
+        (P_): Remove macro.
+
 2010-07-07  Andreas Schwab  <schwab@linux-m68k.org>
 
         * ebrowse.c (add_sym, make_namespace): Replace bcopy, bzero by
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 42bcdfd06f3..a9f7ba4f3a7 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -20,20 +20,14 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
 #include <stdio.h>
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
-
 #include <ctype.h>
 #include <assert.h>
 #include "getopt.h"
@@ -45,12 +39,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Conditionalize function prototypes.  */
 
-#ifdef PROTOTYPES               /* From config.h.  */
-#define P_(x) x
-#else
-#define P_(x) ()
-#endif
-
 /* Value is non-zero if strings X and Y compare equal.  */
 
 #define streq(X, Y) (*(X) == *(Y) && strcmp ((X) + 1, (Y) + 1) == 0)
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index ba619450198..a96422a09a9 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -64,13 +64,6 @@ extern int optind, opterr;
 #define MAX_SCORES 200
 #define MAX_DATA_LEN 1024
 
-/* Declare the prototype for a general external function.  */
-#if defined (PROTOTYPES) || defined (WINDOWSNT)
-#define P_(proto) proto
-#else
-#define P_(proto) ()
-#endif
-
 #ifndef HAVE_DIFFTIME
 /* OK on POSIX (time_t is arithmetic type) modulo overflow in subtraction.  */
 #define difftime(t1, t0) (double)((t1) - (t0))