From b7785b64cf1be1275ee8021418e78f9daf88b6d8 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 24 May 2006 19:21:26 +0200 Subject: [PATCH] Small cleanups to keep p_armpe & p_w32pe in sync. --- src/p_armpe.cpp | 7 ++++--- src/p_w32pe.cpp | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/p_armpe.cpp b/src/p_armpe.cpp index 6041a121..cbfcfdfe 100644 --- a/src/p_armpe.cpp +++ b/src/p_armpe.cpp @@ -35,6 +35,7 @@ static const #include "stub/l_armpea.h" +static const #include "stub/l_armpet.h" #define IDSIZE(x) ih.ddirs[x].size @@ -245,6 +246,7 @@ void PackArmPe::createLinker(const void *pdata, int plen, int pinfo) linker = new ArmLinker(pdata, plen, pinfo); } + /************************************************************************* // util **************************************************************************/ @@ -1218,11 +1220,10 @@ public: bool clear(); void dump() const { dump(root,0); } - unsigned iname() const {return current->parent->id;} + unsigned iname() const {return current->parent->id;} const upx_byte *nname() const {return current->parent->name;} - /* - unsigned ilang() const {return current->id;} + unsigned ilang() const {return current->id;} const upx_byte *nlang() const {return current->name;} */ }; diff --git a/src/p_w32pe.cpp b/src/p_w32pe.cpp index 63530a9e..e86a7491 100644 --- a/src/p_w32pe.cpp +++ b/src/p_w32pe.cpp @@ -1178,11 +1178,10 @@ public: bool clear(); void dump() const { dump(root,0); } - - unsigned iname() const {return current->parent->id;} + unsigned iname() const {return current->parent->id;} const upx_byte *nname() const {return current->parent->name;} /* - unsigned ilang() const {return current->id;} + unsigned ilang() const {return current->id;} const upx_byte *nlang() const {return current->name;} */ };