X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=os400%2Flibxmlrpg%2Fpattern.rpgle;h=2e881e5d2d2efe4195794a3fb7d81a31958c6a63;hb=refs%2Ftags%2Fsubmit%2Ftizen_base%2F20160618.070626;hp=ef0230102909c6e5bb5b722cd17e21768abc8ede;hpb=86bf4fd2367b06f9aa5d8cb40ed6169a001f2668;p=platform%2Fupstream%2Flibxml2.git

diff --git a/os400/libxmlrpg/pattern.rpgle b/os400/libxmlrpg/pattern.rpgle
index ef02301..2e881e5 100644
--- a/os400/libxmlrpg/pattern.rpgle
+++ b/os400/libxmlrpg/pattern.rpgle
@@ -10,13 +10,11 @@
       /define XML_PATTERN_H__
 
       /include "libxmlrpg/xmlversion"
-
-      /if defined(LIBXML_PATTERN_ENABLED)
-
-      /include "libxmlrpg/xmlTypesC"
       /include "libxmlrpg/tree"
       /include "libxmlrpg/dict"
 
+      /if defined(LIBXML_PATTERN_ENABLED)
+
       * xmlPattern:
       *
       * A compiled (XPath based) pattern to select nodes
@@ -30,8 +28,7 @@
       * matching with this module
 
      d xmlPatternFlags...
-     d                 s                   based(######typedef######)
-     d                                     like(xmlCenum)
+     d                 s             10i 0 based(######typedef######)           enum
      d  XML_PATTERN_DEFAULT...                                                  Simple pattern match
      d                 c                   X'0000'
      d  XML_PATTERN_XPATH...                                                    Std XPath pattern
@@ -53,12 +50,11 @@
      d                                     like(xmlPatternPtr)
      d  pattern                        *   value options(*string)               const xmlChar *
      d  dict                           *   value                                xmlDict *
-     d  flags                              value like(xmlCint)
+     d  flags                        10i 0 value
      d  namespaces                     *                                        const xmlChar *(*)
 
      d xmlPatternMatch...
-     d                 pr                  extproc('xmlPatternMatch')
-     d                                     like(xmlCint)
+     d                 pr            10i 0 extproc('xmlPatternMatch')
      d  comp                               value like(xmlPatternPtr)
      d  node                               value like(xmlNodePtr)
 
@@ -68,23 +64,19 @@
      d                 s               *   based(######typedef######)
 
      d xmlPatternStreamable...
-     d                 pr                  extproc('xmlPatternStreamable')
-     d                                     like(xmlCint)
+     d                 pr            10i 0 extproc('xmlPatternStreamable')
      d  comp                               value like(xmlPatternPtr)
 
      d xmlPatternMaxDepth...
-     d                 pr                  extproc('xmlPatternMaxDepth')
-     d                                     like(xmlCint)
+     d                 pr            10i 0 extproc('xmlPatternMaxDepth')
      d  comp                               value like(xmlPatternPtr)
 
      d xmlPatternMinDepth...
-     d                 pr                  extproc('xmlPatternMinDepth')
-     d                                     like(xmlCint)
+     d                 pr            10i 0 extproc('xmlPatternMinDepth')
      d  comp                               value like(xmlPatternPtr)
 
      d xmlPatternFromRoot...
-     d                 pr                  extproc('xmlPatternFromRoot')
-     d                                     like(xmlCint)
+     d                 pr            10i 0 extproc('xmlPatternFromRoot')
      d  comp                               value like(xmlPatternPtr)
 
      d xmlPatternGetStreamCtxt...
@@ -97,33 +89,28 @@
      d  stream                             value like(xmlStreamCtxtPtr)
 
      d xmlStreamPushNode...
-     d                 pr                  extproc('xmlStreamPushNode')
-     d                                     like(xmlCint)
+     d                 pr            10i 0 extproc('xmlStreamPushNode')
      d  stream                             value like(xmlStreamCtxtPtr)
      d  name                           *   value options(*string)               const xmlChar *
      d  ns                             *   value options(*string)               const xmlChar *
-     d  nodeType                           value like(xmlCint)
+     d  nodeType                     10i 0 value
 
-     d xmlStreamPush   pr                  extproc('xmlStreamPush')
-     d                                     like(xmlCint)
+     d xmlStreamPush   pr            10i 0 extproc('xmlStreamPush')
      d  stream                             value like(xmlStreamCtxtPtr)
      d  name                           *   value options(*string)               const xmlChar *
      d  ns                             *   value options(*string)               const xmlChar *
 
      d xmlStreamPushAttr...
-     d                 pr                  extproc('xmlStreamPushAttr')
-     d                                     like(xmlCint)
+     d                 pr            10i 0 extproc('xmlStreamPushAttr')
      d  stream                             value like(xmlStreamCtxtPtr)
      d  name                           *   value options(*string)               const xmlChar *
      d  ns                             *   value options(*string)               const xmlChar *
 
-     d xmlStreamPop    pr                  extproc('xmlStreamPop')
-     d                                     like(xmlCint)
+     d xmlStreamPop    pr            10i 0 extproc('xmlStreamPop')
      d  stream                             value like(xmlStreamCtxtPtr)
 
      d xmlStreamWantsAnyNode...
-     d                 pr                  extproc('xmlStreamWantsAnyNode')
-     d                                     like(xmlCint)
+     d                 pr            10i 0 extproc('xmlStreamWantsAnyNode')
      d  stream                             value like(xmlStreamCtxtPtr)
 
       /endif                                                                    LIBXML_PATTERN_ENBLD