Skip to content

Ockc update V_8.9.14 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smcmahonibm merged 7 commits into from
Sep 18, 2025
Merged

Ockc update V_8.9.14 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fa3d63a
Copyright and Indentation fixes
robindubeyibm Sep 15, 2025
83b16fb
Minor code changes
robindubeyibm Sep 15, 2025
9c01bdc
Files with big diff from v_8.9.14
robindubeyibm Sep 15, 2025
97352d4
including zlib-1.3.1
robindubeyibm Sep 15, 2025
cd01a75
removing changes CI failure
robindubeyibm Sep 16, 2025
c04b66d
Review Comments addressed
robindubeyibm Sep 17, 2025
f55d949
Remaining updates
Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions icc/DELTA/exports/icclib_zos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
// Copyright IBM Corp. 2023
//
// Licensed under the Apache License 2.0 (the "License").  You may not use
// this file except in compliance with the License.  You can obtain a copy
// Licensed under the Apache License 2.0 (the "License"). You may not use
// this file except in compliance with the License. You can obtain a copy
// in the file LICENSE in the source distribution.
*/
/* z/OS pragma's to control symbol visbility */
Expand Down
6 changes: 3 additions & 3 deletions icc/DepScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// in the file LICENSE in the source distribution.
*************************************************************************/

/*************************************************************************
//
// Description:
//
// Input: functions.txt, symbols.txt
Expand All @@ -18,8 +18,8 @@
// to produce a makefile stub which
// includes only those objects ICC depends on directly or
// indirectly to function. i.e. we produce a list of objects
// excluding "dead code"
*************************************************************************/
// excluding "dead code"
//


/* TBD
Expand Down
25 changes: 13 additions & 12 deletions icc/ICCencapsulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ public static void main(String[] args)
doWork(new File_JCC_A_H()); // Header for jgsk_wrap2_a.c
} catch (Exception e) {
e.printStackTrace();
System.exit(-1);
}
}
}
Expand Down Expand Up @@ -523,13 +524,13 @@ class FileType {
FileWriter writer;
public String name = "";
static final String copyrightheader =
"/*-----------------------------------------------------------------\n"+
"// Copyright IBM Corp. 2023\n"+
"//\n"+
"// Licensed under the Apache License 2.0 (the \"License\"). You may not use\n"+
"// this file except in compliance with the License. You can obtain a copy\n"+
"// in the file LICENSE in the source distribution.\n"+
"//----------------------------------------------------------------*/\n\n\n";
"/*\n"+
"** Machine generated code: DO NOT EDIT\n"+
"**\n"+
"** Licensed under the Apache License 2.0 (the \"License\"). You may not use\n"+
"** this file except in compliance with the License. You can obtain a copy\n"+
"** in the file LICENSE in the source distribution.\n"+
"*/\n\n\n";
static final String preambleend = "/* Machine generated code: DO NOT EDIT */";
static final String postamble = "/* Machine generated code: DO NOT EDIT */";

Expand Down Expand Up @@ -573,6 +574,7 @@ class FileType {
" * @return The path length on sucess,0 on failure, -1 on a parameter error\n"+
" */\n"+
"int ICC_LINKAGE gskiccs_path(char *return_path, int path_len);\n\n"+
"int ICC_LINKAGE ICC_gskiccs_path(char *return_path, int path_len);\n\n"+

"\n",
"#if defined(_WIN32)\n"+
Expand Down Expand Up @@ -1098,7 +1100,7 @@ class File_ICC_A_H extends FileType {

public void Preamble() throws Exception {
super.Preamble();
writer.write("/** \\file icc_a.h\n" + "* Function prototypes for the ICC API (ICCSDK).\n"
writer.write("/*\n" + "* Function prototypes for the ICC API (ICCSDK).\n"
+ "* This file is autogenerated and should only be included via icc.h.\n" + "*/\n\n");

writer.write("\n#ifndef INCLUDED_ICC_A\n#define INCLUDED_ICC_A\n");
Expand Down Expand Up @@ -1420,7 +1422,7 @@ public void Preamble() throws Exception {
pcbtype = ICCencapsulator.ICCPCB;

super.Preamble();
writer.write("/*! \\file icc_a.h\n" + "* Function prototypes for the ICC API (ICCSDK)\n"
writer.write("/*\n" + "* Function prototypes for the ICC API (ICCSDK)\n"
+ "* This file is autogenerated and should only be included via icc.h\n" + "*/\n");

writer.write("\n#ifndef INCLUDED_ICC_A\n#define INCLUDED_ICC_A\n\n");
Expand Down Expand Up @@ -1701,8 +1703,7 @@ public void Preamble() throws Exception {

pcbtype = ICCencapsulator.ICCPCB;

writer.write("/*! \\file jcc_a.h\n" + "* Function prototypes for the ICC API (ICCSDK) - JCEPlus version \n"
+ "* This file is autogenerated and should be included prior to icc.h\n" + "*/\n\n");
writer.write("/*\n* This file is autogenerated and should be included prior to icc.h\n" + "*/\n\n");
// do this more elegantly iff we have more OS specific calls
writer.write("#if defined(_WIN32)\n");
writer.write("# define ICC_InitW JCC_InitW\n");
Expand Down Expand Up @@ -1898,7 +1899,7 @@ public void Preamble() throws Exception
{
super.Preamble();

writer.write("/** \\file icc_a.h\n"+
writer.write("/*\n"+
"* Function prototypes for the ICC extended API.\n"+
"* This file is autogenerated and should only be included via icc_aux.h.\n"+
"*/\n\n");
Expand Down
Loading