Merge from emacs-23; up to 2010-06-11T18:51:00Z!juri@jurta.org.

[bpt/emacs.git] / nt / ddeclient.c

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 3a82395..fbb7d36 100644 (file)
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -1,12 +1,12 @@
 /* Simple client interface to DDE servers.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+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 2, 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
@@ -14,9 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <windows.h>
 #include <ddeml.h>
@@ -36,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;
@@ -74,3 +70,4 @@ main (argc, argv)
 
   return (0);
 }
+