Skip to content

Commit 3688bdf

Browse files
authored
Merge pull request #18 from IBM/OCKC_update
Ockc update V_8.9.14
2 parents 193bb9c + f55d949 commit 3688bdf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+874
-632
lines changed

icc/DELTA/exports/icclib_zos.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
// Copyright IBM Corp. 2023
33
//
4-
// Licensed under the Apache License 2.0 (the "License").  You may not use
5-
// this file except in compliance with the License.  You can obtain a copy
4+
// Licensed under the Apache License 2.0 (the "License"). You may not use
5+
// this file except in compliance with the License. You can obtain a copy
66
// in the file LICENSE in the source distribution.
77
*/
88
/* z/OS pragma's to control symbol visbility */

icc/DepScanner.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// in the file LICENSE in the source distribution.
77
*************************************************************************/
88

9-
/*************************************************************************
9+
//
1010
// Description:
1111
//
1212
// Input: functions.txt, symbols.txt
@@ -18,8 +18,8 @@
1818
// to produce a makefile stub which
1919
// includes only those objects ICC depends on directly or
2020
// indirectly to function. i.e. we produce a list of objects
21-
// excluding "dead code"
22-
*************************************************************************/
21+
// excluding "dead code"
22+
//
2323

2424

2525
/* TBD

icc/ICCencapsulator.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ public static void main(String[] args)
422422
doWork(new File_JCC_A_H()); // Header for jgsk_wrap2_a.c
423423
} catch (Exception e) {
424424
e.printStackTrace();
425+
System.exit(-1);
425426
}
426427
}
427428
}
@@ -523,13 +524,13 @@ class FileType {
523524
FileWriter writer;
524525
public String name = "";
525526
static final String copyrightheader =
526-
"/*-----------------------------------------------------------------\n"+
527-
"// Copyright IBM Corp. 2023\n"+
528-
"//\n"+
529-
"// Licensed under the Apache License 2.0 (the \"License\"). You may not use\n"+
530-
"// this file except in compliance with the License. You can obtain a copy\n"+
531-
"// in the file LICENSE in the source distribution.\n"+
532-
"//----------------------------------------------------------------*/\n\n\n";
527+
"/*\n"+
528+
"** Machine generated code: DO NOT EDIT\n"+
529+
"**\n"+
530+
"** Licensed under the Apache License 2.0 (the \"License\"). You may not use\n"+
531+
"** this file except in compliance with the License. You can obtain a copy\n"+
532+
"** in the file LICENSE in the source distribution.\n"+
533+
"*/\n\n\n";
533534
static final String preambleend = "/* Machine generated code: DO NOT EDIT */";
534535
static final String postamble = "/* Machine generated code: DO NOT EDIT */";
535536

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

577579
"\n",
578580
"#if defined(_WIN32)\n"+
@@ -1098,7 +1100,7 @@ class File_ICC_A_H extends FileType {
10981100

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

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

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

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

17021704
pcbtype = ICCencapsulator.ICCPCB;
17031705

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

1901-
writer.write("/** \\file icc_a.h\n"+
1902+
writer.write("/*\n"+
19021903
"* Function prototypes for the ICC extended API.\n"+
19031904
"* This file is autogenerated and should only be included via icc_aux.h.\n"+
19041905
"*/\n\n");

0 commit comments

Comments
 (0)