diff options
| author | Xin Li <delphij@google.com> | 2016-07-26 14:22:54 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2016-08-15 22:30:45 +0000 |
| commit | a136fc2e5a8893a02b0912862d26a575fcbd641a (patch) | |
| tree | 341dc6790424526b424173dc7bc5a1165db7de10 /os400/libxmlrpg/xlink.rpgle | |
| parent | edb5870767fed8712a9b77ef34097209b61ab2db (diff) | |
| download | android_external_libxml2-a136fc2e5a8893a02b0912862d26a575fcbd641a.tar.gz android_external_libxml2-a136fc2e5a8893a02b0912862d26a575fcbd641a.tar.bz2 android_external_libxml2-a136fc2e5a8893a02b0912862d26a575fcbd641a.zip | |
Merge remote-tracking branch 'goog/upstream-master' into mymerge
BUG: 29834751
Change-Id: I88fc1d4f86bcbd0ac0fe9acdbe764f3d738c5f32
(cherry picked from commit e3d78e1fe0669e9c7083a4de19f1e06171849b28)
Diffstat (limited to 'os400/libxmlrpg/xlink.rpgle')
| -rw-r--r-- | os400/libxmlrpg/xlink.rpgle | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/os400/libxmlrpg/xlink.rpgle b/os400/libxmlrpg/xlink.rpgle index 964e605f..e6ebdc64 100644 --- a/os400/libxmlrpg/xlink.rpgle +++ b/os400/libxmlrpg/xlink.rpgle @@ -9,10 +9,12 @@ /define XML_XLINK_H__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/tree" /if defined(LIBXML_XPTR_ENABLED) + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/tree" + * Various defines for the various Link properties. * * NOTE: the link detection layer will try to resolve QName expansion @@ -26,7 +28,8 @@ d xlinkRole s * based(######typedef######) xmlChar * d xlinkTitle s * based(######typedef######) xmlChar * - d xlinkType s 10i 0 based(######typedef######) enum + d xlinkType s based(######typedef######) + d like(xmlCenum) d XLINK_TYPE_NONE... d c 0 d XLINK_TYPE_SIMPLE... @@ -36,7 +39,8 @@ d XLINK_TYPE_EXTENDED_SET... d c 3 - d xlinkShow s 10i 0 based(######typedef######) enum + d xlinkShow s based(######typedef######) + d like(xmlCenum) d XLINK_SHOW_NONE... d c 0 d XLINK_SHOW_NEW... @@ -46,7 +50,8 @@ d XLINK_SHOW_REPLACE... d c 3 - d xlinkActuate s 10i 0 based(######typedef######) enum + d xlinkActuate s based(######typedef######) + d like(xmlCenum) d XLINK_ACTUATE_NONE... d c 0 d XLINK_ACTUATE_AUTO... |