From 44ba67f99bf1018ed5c12dc8b75c8343ffb2b9ff Mon Sep 17 00:00:00 2001 From: upstream svn Date: Wed, 18 Feb 2009 14:56:53 +0100 Subject: [PATCH] Upstream tarball 9433 --- .svn-revision | 2 +- src/libs/ec/abstracts/ECCodes.abstract | 2 +- src/libs/ec/c#/ECCodes.cs | 4 ++-- src/libs/ec/cpp/ECCodes.h | 2 +- src/libs/ec/java/ECCodes.java | 2 +- src/pixmaps/flags_xpm/makeflags.sh | 4 ++-- src/remote-gui.net/ECCodes.cs | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.svn-revision b/.svn-revision index 2d16adaa..0e4662f6 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -9431 +9433 diff --git a/src/libs/ec/abstracts/ECCodes.abstract b/src/libs/ec/abstracts/ECCodes.abstract index a404502b..54deb355 100644 --- a/src/libs/ec/abstracts/ECCodes.abstract +++ b/src/libs/ec/abstracts/ECCodes.abstract @@ -17,7 +17,7 @@ ec_taglen_t uint32 Type Enum Name ProtocolVersion DataType uint16 -EC_CURRENT_PROTOCOL_VERSION 0x0200 +EC_CURRENT_PROTOCOL_VERSION 0x0201 [/Section] # This flags are used on the transmission layer. diff --git a/src/libs/ec/c#/ECCodes.cs b/src/libs/ec/c#/ECCodes.cs index c7f488b6..89ecbeff 100644 --- a/src/libs/ec/c#/ECCodes.cs +++ b/src/libs/ec/c#/ECCodes.cs @@ -27,7 +27,7 @@ namespace amule.net { public enum ProtocolVersion { - EC_CURRENT_PROTOCOL_VERSION = 0x0200 + EC_CURRENT_PROTOCOL_VERSION = 0x0201 }; public enum ECFlags { EC_FLAG_ZLIB = 0x00000001, @@ -35,7 +35,7 @@ public enum ECFlags { EC_FLAG_HAS_ID = 0x00000004, EC_FLAG_ACCEPTS = 0x00000010, EC_FLAG_NOTIFY = 0x00008000, - EC_FLAG_UNKNOWN_MASK = 0xff7f7f08 + }; public enum ECOpCodes { EC_OP_NOOP = 0x01, diff --git a/src/libs/ec/cpp/ECCodes.h b/src/libs/ec/cpp/ECCodes.h index 0aa30566..d3f24ea0 100644 --- a/src/libs/ec/cpp/ECCodes.h +++ b/src/libs/ec/cpp/ECCodes.h @@ -33,7 +33,7 @@ typedef uint8_t ec_tagtype_t; typedef uint32_t ec_taglen_t; enum ProtocolVersion { - EC_CURRENT_PROTOCOL_VERSION = 0x0200 + EC_CURRENT_PROTOCOL_VERSION = 0x0201 }; enum ECFlags { diff --git a/src/libs/ec/java/ECCodes.java b/src/libs/ec/java/ECCodes.java index 19b24964..f87f8ac5 100644 --- a/src/libs/ec/java/ECCodes.java +++ b/src/libs/ec/java/ECCodes.java @@ -27,7 +27,7 @@ public interface ECCodes { -public final static short EC_CURRENT_PROTOCOL_VERSION = 0x0200; +public final static short EC_CURRENT_PROTOCOL_VERSION = 0x0201; public final static int EC_FLAG_ZLIB = 0x00000001; public final static int EC_FLAG_UTF8_NUMBERS = 0x00000002; diff --git a/src/pixmaps/flags_xpm/makeflags.sh b/src/pixmaps/flags_xpm/makeflags.sh index 73f58d45..b9625350 100755 --- a/src/pixmaps/flags_xpm/makeflags.sh +++ b/src/pixmaps/flags_xpm/makeflags.sh @@ -3,7 +3,7 @@ # Create Makefile.am echo > Makefile.am echo 'EXTRA_DIST = \' >> Makefile.am -ls *.xpm | sed -e 's/^/\t/' -e 's/$/ \\/' >> Makefile.am +ls *.xpm | sed -e 's/^/ /' -e 's/$/ \\/' >> Makefile.am echo ' makeflags.sh' >> Makefile.am # Create CountryFlags.h and header @@ -35,7 +35,7 @@ echo >> CountryFlags.h # Create the flag/Code vector echo 'static struct FlagXPMCode flagXPMCodeVector[] = {'>> CountryFlags.h ls *.xpm | sed -e 's/\.xpm$//;/\//s:.*/\([^/][^/]*\):\1:' | \ - sed -e 's/[A-Za-z]*/\t{&, "&"},/' | \ + sed -e 's/[A-Za-z]*/ {&, "&"},/' | \ sed -e 's/do/do_/1' \ >> CountryFlags.h echo '};'>> CountryFlags.h diff --git a/src/remote-gui.net/ECCodes.cs b/src/remote-gui.net/ECCodes.cs index c7f488b6..89ecbeff 100644 --- a/src/remote-gui.net/ECCodes.cs +++ b/src/remote-gui.net/ECCodes.cs @@ -27,7 +27,7 @@ namespace amule.net { public enum ProtocolVersion { - EC_CURRENT_PROTOCOL_VERSION = 0x0200 + EC_CURRENT_PROTOCOL_VERSION = 0x0201 }; public enum ECFlags { EC_FLAG_ZLIB = 0x00000001, @@ -35,7 +35,7 @@ public enum ECFlags { EC_FLAG_HAS_ID = 0x00000004, EC_FLAG_ACCEPTS = 0x00000010, EC_FLAG_NOTIFY = 0x00008000, - EC_FLAG_UNKNOWN_MASK = 0xff7f7f08 + }; public enum ECOpCodes { EC_OP_NOOP = 0x01, -- 2.11.4.GIT