Merge from origin/emacs-25

[gnu-emacs] / nt / ddeclient.c

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 876f24b78d2df5a96fee71a8fc2e602e6dee78f9..7bbbdb0f48b40667f5f4f620cbe4361502d166af 100644 (file)
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -1,13 +1,12 @@
 /* Simple client interface to DDE servers.
-   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007, 2008, 2009, 2010, 2011, 2012  Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,9 +34,7 @@ DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
                              CF_TEXT, XTYP_EXECUTE, 30000, NULL)
 
 int
-main (argc, argv)
-     int argc;
-     char *argv[];
+main (int argc, char *argv[])
 {
   DWORD idDde = 0;
   HCONV HConversation;
@@ -73,6 +70,3 @@ main (argc, argv)
 
   return (0);
 }
-
-/* arch-tag: 360d7a99-2cae-447e-8d06-41ca41987e30
-   (do not change this comment) */