From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 6 Jul 2010 13:36:27 +0000 (-0400)
Subject: rxkad heimdal cleanup
X-Git-Tag: openafs-devel-1_5_75^0
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=af5c302f0da739a70777980fd4ab7f9490ae51c3;p=packages%2Fo%2Fopenafs.git

rxkad heimdal cleanup

don't assume every system have uint16_t and uint32_t;
instead massage for use of native afs types.

Change-Id: I8943f37ecf6dd5d1565ed295b6e6a2ca9eea5b6d
Reviewed-on: http://gerrit.openafs.org/2334
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/rxkad/README.v5 b/src/rxkad/README.v5
index 5e260d136..9113579c1 100644
--- a/src/rxkad/README.v5
+++ b/src/rxkad/README.v5
@@ -52,6 +52,8 @@ export htree otree
 | cat > $otree/src/rxkad/v5der.c
 
 grep -v 'struct units'  $hotree/lib/asn1/krb5_asn1.h \
+ | sed s/uint16_t/afs_uint16/ \
+ | sed s/uint32_t/afs_uint32/ \
    > $otree/src/rxkad/v5gen.h
 
 cp  $hotree/lib/asn1/der-protos.h \
diff --git a/src/rxkad/v5gen.h b/src/rxkad/v5gen.h
index 2d87f6318..5ca4f9779 100644
--- a/src/rxkad/v5gen.h
+++ b/src/rxkad/v5gen.h
@@ -31,12 +31,12 @@ typedef char *heim_ia5_string;
 
 typedef struct heim_bmp_string {
   size_t length;
-  uint16_t *data;
+  afs_uint16 *data;
 } heim_bmp_string;
 
 typedef struct heim_universal_string {
   size_t length;
-  uint32_t *data;
+  afs_uint32 *data;
 } heim_universal_string;
 
 typedef char *heim_visible_string;