[Wine-patches] [eterhack] ping fixes

[Alexander Morozov]

----------- следующая часть -----------
From 60410c874433ab39eb54329f2c352893d5a03c94 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Wed, 29 Dec 2010 17:16:16 +0300
Subject: [eterhack 1/3] ping: ping_rc.rc is not needed.

---
 programs/ping/Makefile.in |    3 ++-
 programs/ping/ping.h      |    2 ++
 programs/ping/ping_rc.rc  |   30 ------------------------------
 3 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 programs/ping/ping_rc.rc

diff --git a/programs/ping/Makefile.in b/programs/ping/Makefile.in
index 9ab905a..89c3897 100644
--- a/programs/ping/Makefile.in
+++ b/programs/ping/Makefile.in
@@ -8,6 +8,7 @@ C_SRCS = \
 	ping_main.c
 
 RC_SRCS = \
-	ping_rc.rc
+	En.rc \
+	Ru.rc
 
 @MAKE_PROG_RULES@
diff --git a/programs/ping/ping.h b/programs/ping/ping.h
index c86fef6..b06c296 100644
--- a/programs/ping/ping.h
+++ b/programs/ping/ping.h
@@ -21,6 +21,8 @@
 #ifndef PING_H
 # define PING_H
 
+#include <windef.h>
+
 # define PING_MESSAGE_CLI_SYNTAX                1000
 # define PING_MESSAGE_HELP                      1001
 # define PING_MESSAGE_WSASTARTUP_ERROR          1002
diff --git a/programs/ping/ping_rc.rc b/programs/ping/ping_rc.rc
deleted file mode 100644
index c6b9855..0000000
--- a/programs/ping/ping_rc.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * ping resources
- * Copyright (C) 2010 Devaev Maxim
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-#include <windef.h>
-#include <winuser.h>
-
-#include "ping.h"
-
-#include "Ru.rc"
-#include "En.rc"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-- 
1.7.3.4

----------- следующая часть -----------
From 27f708ea05b24343429bf712da5b0e3fd6e32eed Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Wed, 29 Dec 2010 17:18:03 +0300
Subject: [eterhack 2/3] ping: Do not specify code page for english.

---
 programs/ping/En.rc |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/programs/ping/En.rc b/programs/ping/En.rc
index 39ac3e0..b80f9c6 100644
--- a/programs/ping/En.rc
+++ b/programs/ping/En.rc
@@ -19,7 +19,6 @@
 
 
 #include "ping.h"
-#pragma code_page(65001)
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
-- 
1.7.3.4

----------- следующая часть -----------
From 8079680cae4da6a1d8668aa017e3817efe2db5e8 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Wed, 29 Dec 2010 17:19:33 +0300
Subject: [eterhack 3/3] ping: Do not use c++ style in comments.

---
 programs/ping/ping.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/ping/ping.h b/programs/ping/ping.h
index b06c296..dd8a55a 100644
--- a/programs/ping/ping.h
+++ b/programs/ping/ping.h
@@ -36,5 +36,5 @@
 
 # define MAXSTRING 8192
 
-#endif // PING_H
+#endif  /* PING_H */
 
-- 
1.7.3.4