[Emacs-diffs] /srv/bzr/emacs/trunk r100688: Remove __P.

[Jan D]

------------------------------------------------------------
revno: 100688
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Fri 2010-07-02 14:55:51 +0200
message:
  Remove __P.
modified:
  ChangeLog
  configure.in
  lib-src/etags.c
  lib-src/pop.c
  src/ChangeLog
  src/config.in
  src/dosfns.h
  src/mktime.c
  src/strftime.c
  src/w32font.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-07-02 08:11:24 +0000
+++ b/ChangeLog 2010-07-02 12:55:51 +0000
@@ -1,3 +1,7 @@
+2010-07-02  Jan Djärv  <address@hidden>
+
+       * configure.in: Remove define __P.
+
 2010-07-02  Dan Nicolaescu  <address@hidden>
 
        * configure.in (--enable-use-lisp-union-type): New flag.

=== modified file 'configure.in'
--- a/configure.in      2010-07-02 08:11:24 +0000
+++ b/configure.in      2010-07-02 12:55:51 +0000
@@ -3574,14 +3574,6 @@
 /* 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>

=== modified file 'lib-src/etags.c'
--- a/lib-src/etags.c   2010-07-02 12:19:53 +0000
+++ b/lib-src/etags.c   2010-07-02 12:55:51 +0000
@@ -100,15 +100,10 @@
 # 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

=== modified file 'lib-src/pop.c'
--- a/lib-src/pop.c     2010-07-02 12:19:53 +0000
+++ b/lib-src/pop.c     2010-07-02 12:55:51 +0000
@@ -108,14 +108,6 @@
 #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 *);

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-02 12:19:53 +0000
+++ b/src/ChangeLog     2010-07-02 12:55:51 +0000
@@ -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:

=== modified file 'src/config.in'
--- a/src/config.in     2010-07-02 08:11:24 +0000
+++ b/src/config.in     2010-07-02 12:55:51 +0000
@@ -1141,14 +1141,6 @@
 /* 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>

=== modified file 'src/dosfns.h'
--- a/src/dosfns.h      2010-01-13 08:35:10 +0000
+++ b/src/dosfns.h      2010-07-02 12:55:51 +0000
@@ -38,8 +38,8 @@
 #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

=== modified file 'src/mktime.c'
--- a/src/mktime.c      2010-01-04 05:35:18 +0000
+++ b/src/mktime.c      2010-07-02 12:55:51 +0000
@@ -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

=== modified file 'src/strftime.c'
--- a/src/strftime.c    2010-07-02 12:19:53 +0000
+++ b/src/strftime.c    2010-07-02 12:55:51 +0000
@@ -131,14 +131,6 @@
 # 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 *

=== modified file 'src/w32font.h'
--- a/src/w32font.h     2010-01-13 08:35:10 +0000
+++ b/src/w32font.h     2010-07-02 12:55:51 +0000
@@ -62,26 +62,26 @@
 
 #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