From 288ba60c7f6f0ab592e9734f96bc03d4267f86f4 Mon Sep 17 00:00:00 2001 From: Theresa Mammarella Date: Mon, 18 Jun 2018 11:16:49 -0400 Subject: [PATCH] Clean up outdated code for palm-size pc Signed-off-by: Theresa Mammarella --- .../ibm/j9/uma/platform/PlatformWindows.java | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java index 6fc2e1f6c62..35c169ef9d7 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java @@ -191,9 +191,8 @@ void writeExecutableResourceFile(Artifact artifact) throws UMAException { buffer.append( "\n" + - "#include \n"); - writeResourceFileDefines(buffer); - buffer.append( + "#include \n" + + "#include \n" + "#include \"j9cfg.h\"\n" + "#include \"j9version.h\"\n" + "\n" + @@ -492,18 +491,6 @@ void writeResourceFile(Artifact artifact) throws UMAException { break; } } - - final protected void writeResourceFileDefines(StringBuffer buffer) throws UMAException { - String ceOsType = replaceMacro("uma_ce_os_type"); - if ( ceOsType!=null && ceOsType.equalsIgnoreCase("Palm-size PC 2.11") ) { - buffer.append("#define VS_VERSION_INFO 1\n" + - "#define VOS_NT_WINDOWS32 0x00040004L\n" + - "#define VFT_APP 0x00000001L\n" + - "#define VFT_DLL 0x00000002L\n"); - } else { - buffer.append("#include \n"); - } - } // TODO: move to template file void writeSharedLibResourceFile(Artifact artifact) throws UMAException { @@ -522,9 +509,8 @@ void writeSharedLibResourceFile(Artifact artifact) throws UMAException { buffer.append( "\n" + - "#include \n" ); - writeResourceFileDefines(buffer); - buffer.append( + "#include \n" + + "#include \n" + "#include \"j9cfg.h\"\n" + "#include \"j9version.h\"\n" + "\n" +