From f181d5ce82470639459555cd59a076963861a61d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Thu, 19 Mar 2020 12:28:37 +0100 Subject: [PATCH] tools: Only update protocol version if something changed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémi Bernon Signed-off-by: Alexandre Julliard --- include/wine/server_protocol.h | 4 ++++ tools/make_requests | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index af4507b5d18..ba70d13a391 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -6706,6 +6706,10 @@ union generic_reply struct resume_process_reply resume_process_reply; }; +/* ### protocol_version begin ### */ + #define SERVER_PROTOCOL_VERSION 596 +/* ### protocol_version end ### */ + #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/tools/make_requests b/tools/make_requests index 4e39bb65a9a..a30c9be9056 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -406,10 +406,23 @@ print SERVER_PROT " struct reply_header reply_header;\n"; foreach my $req (@requests) { print SERVER_PROT " struct ${req}_reply ${req}_reply;\n"; } print SERVER_PROT "};\n\n"; -printf SERVER_PROT "#define SERVER_PROTOCOL_VERSION %d\n\n", $protocol + 1; +print SERVER_PROT "/* ### protocol_version begin ### */\n\n"; +printf SERVER_PROT "#define SERVER_PROTOCOL_VERSION %d\n\n", $protocol; +print SERVER_PROT "/* ### protocol_version end ### */\n\n"; print SERVER_PROT "#endif /* __WINE_WINE_SERVER_PROTOCOL_H */\n"; close SERVER_PROT; -update_file( "include/wine/server_protocol.h" ); + +if (update_file( "include/wine/server_protocol.h" )) +{ + my @version_lines = (); + + push @version_lines, sprintf( "#define SERVER_PROTOCOL_VERSION %d\n", $protocol + 1 ); + + replace_in_file( "include/wine/server_protocol.h", + "### protocol_version begin ###", + "### protocol_version end ###", + @version_lines ); +} ### Output the dumping function tables