10 files changed, 28 insertions, 67 deletions

diff --git a/ChangeLog b/ChangeLog
index 819b6ebfa7e..a04fceaa5bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * configure.in: Remove define __P.
+
 2010-07-02  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * configure.in (--enable-use-lisp-union-type): New flag.
diff --git a/configure.in b/configure.in
index b04bf6ea744..673674b5d88 100644
--- a/configure.in
+++ b/configure.in
@@ -3574,14 +3574,6 @@ extern char *getenv ();
 /* Define if the compiler supports function prototypes.  It may do so but
    not define __STDC__ (e.g. DEC C by default) or may define it as zero.  */
 #undef PROTOTYPES
-/* For mktime.c:  */
-#ifndef __P
-# if defined PROTOTYPES
-#  define __P(args) args
-# else
-#  define __P(args) ()
-# endif  /* GCC.  */
-#endif /* __P */
 
 #ifdef HAVE_STRING_H
 #include <string.h>
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 53c878ec723..34d1a2ba341 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -100,15 +100,10 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 # ifndef PTR                    /* for XEmacs */
 #   define PTR void *
 # endif
-# ifndef __P                    /* for XEmacs */
-#   define __P(args) args
-# endif
 #else  /* no config.h */
 # if defined(__STDC__) && (__STDC__ || defined(__SUNPRO_C))
-#   define __P(args) args       /* use prototypes */
 #   define PTR void *           /* for generic pointers */
 # else /* not standard C */
-#   define __P(args) ()         /* no prototypes */
 #   define const                /* remove const for old compilers' sake */
 #   define PTR long *           /* don't use void* */
 # endif
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 974ae784794..59ec84c627c 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -108,14 +108,6 @@ extern int h_errno;
 #endif
 #endif
 
-#ifndef __P
-# ifdef __STDC__
-#  define __P(a) a
-# else
-#  define __P(a) ()
-# endif /* __STDC__ */
-#endif /* ! __P */
-
 static int socket_connection (char *, int);
 static int pop_getline (popserver, char **);
 static int sendline (popserver, char *);
diff --git a/src/ChangeLog b/src/ChangeLog
index b36953e23f3..cac04c6909d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -79,6 +79,7 @@
         * composite.h:
         * dispextern.h:
         * disptab.h:
+        * dosfns.h:
         * font.h:
         * fontset.h:
         * frame.h:
@@ -99,6 +100,7 @@
         * syssignal.h:
         * systime.h:
         * termhooks.h:
+        * w32font.h:
         * w32term.h:
         * widget.h:
         * window.h:
diff --git a/src/config.in b/src/config.in
index b1370dcbb95..cfbae052c1a 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1141,14 +1141,6 @@ extern char *getenv ();
 /* Define if the compiler supports function prototypes.  It may do so but
    not define __STDC__ (e.g. DEC C by default) or may define it as zero.  */
 #undef PROTOTYPES
-/* For mktime.c:  */
-#ifndef __P
-# if defined PROTOTYPES
-#  define __P(args) args
-# else
-#  define __P(args) ()
-# endif  /* GCC.  */
-#endif /* __P */
 
 #ifdef HAVE_STRING_H
 #include <string.h>
diff --git a/src/dosfns.h b/src/dosfns.h
index 1759ffd8a90..820b6b30e43 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -38,8 +38,8 @@ extern Lisp_Object Vdos_windows_version;
 #ifndef HAVE_X_WINDOWS
 extern Lisp_Object Vdos_display_scancodes;
 
-extern int         msdos_stdcolor_idx  P_ ((const char *));
-extern Lisp_Object msdos_stdcolor_name P_ ((int));
+extern int         msdos_stdcolor_idx  (const char *);
+extern Lisp_Object msdos_stdcolor_name (int);
 #endif
 
 /* arch-tag: a83b8c4c-63c8-451e-9e94-bc72e3e2f8bc
diff --git a/src/mktime.c b/src/mktime.c
index 20c1092a62a..3570cecd451 100644
--- a/src/mktime.c
+++ b/src/mktime.c
@@ -57,14 +57,6 @@
 # define mktime my_mktime
 #endif /* DEBUG */
 
-#ifndef __P
-# if defined __GNUC__ || (defined __STDC__ && __STDC__)
-#  define __P(args) args
-# else
-#  define __P(args) ()
-# endif  /* GCC.  */
-#endif  /* Not __P.  */
-
 #ifndef CHAR_BIT
 # define CHAR_BIT 8
 #endif
diff --git a/src/strftime.c b/src/strftime.c
index e96d8a92332..a7617427793 100644
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -131,14 +131,6 @@ extern char *tzname[];
 # endif
 #endif
 
-#ifndef __P
-# if defined __GNUC__ || (defined __STDC__ && __STDC__) || defined (PROTOTYPES)
-#  define __P(args) args
-# else
-#  define __P(args) ()
-# endif  /* GCC.  */
-#endif  /* Not __P.  */
-
 #ifndef PTR
 # ifdef __STDC__
 #  define PTR void *
diff --git a/src/w32font.h b/src/w32font.h
index 3e2345589b5..6479f95faf5 100644
--- a/src/w32font.h
+++ b/src/w32font.h
@@ -62,26 +62,26 @@ struct w32font_info
 
 #define CACHE_BLOCKSIZE 128
 
-Lisp_Object w32font_get_cache P_ ((FRAME_PTR fe));
-Lisp_Object w32font_list_internal P_ ((Lisp_Object frame,
-                                       Lisp_Object font_spec,
-                                       int opentype_only));
-Lisp_Object w32font_match_internal P_ ((Lisp_Object frame,
-                                        Lisp_Object font_spec,
-                                        int opentype_only));
-int w32font_open_internal P_ ((FRAME_PTR f, Lisp_Object font_entity,
-                               int pixel_size, Lisp_Object font_object));
-void w32font_close P_ ((FRAME_PTR f, struct font *font));
-int w32font_has_char P_ ((Lisp_Object entity, int c));
-int w32font_text_extents P_ ((struct font *font, unsigned *code, int nglyphs,
-                              struct font_metrics *metrics));
-int w32font_draw P_ ((struct glyph_string *s, int from, int to,
-                      int x, int y, int with_background));
-
-
-int uniscribe_check_otf P_ ((LOGFONT *font, Lisp_Object otf_spec));
-
-Lisp_Object intern_font_name P_ ((char *));
+Lisp_Object w32font_get_cache (FRAME_PTR fe);
+Lisp_Object w32font_list_internal (Lisp_Object frame,
+                                   Lisp_Object font_spec,
+                                   int opentype_only);
+Lisp_Object w32font_match_internal (Lisp_Object frame,
+                                    Lisp_Object font_spec,
+                                    int opentype_only);
+int w32font_open_internal (FRAME_PTR f, Lisp_Object font_entity,
+                           int pixel_size, Lisp_Object font_object);
+void w32font_close (FRAME_PTR f, struct font *font);
+int w32font_has_char (Lisp_Object entity, int c);
+int w32font_text_extents (struct font *font, unsigned *code, int nglyphs,
+                          struct font_metrics *metrics);
+int w32font_draw (struct glyph_string *s, int from, int to,
+                  int x, int y, int with_background);
+
+
+int uniscribe_check_otf (LOGFONT *font, Lisp_Object otf_spec);
+
+Lisp_Object intern_font_name (char *);
 
 #endif