summaryrefslogtreecommitdiffstats
path: root/otherlibs/str
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2005-09-22 14:21:50 +0000
committerXavier Leroy <xavier.leroy@inria.fr>2005-09-22 14:21:50 +0000
commit3de54dec267abf845ca32bd1f6026834cc04d853 (patch)
treedaa34de1fd38e86c2dd0c67896c3c5748511fe1c /otherlibs/str
parent11524e2578b62fa30620121873aa372b180c0a74 (diff)
Remplacement long/unsigned long par intnat/uintnat
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7064 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/str')
-rw-r--r--otherlibs/str/strstubs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/otherlibs/str/strstubs.c b/otherlibs/str/strstubs.c
index a399c24eb..13b5d2cc1 100644
--- a/otherlibs/str/strstubs.c
+++ b/otherlibs/str/strstubs.c
@@ -33,9 +33,9 @@ union backtrack_point {
} undo;
};
-#define Set_tag(p) ((value *) ((long)(p) | 1))
-#define Clear_tag(p) ((value *) ((long)(p) & ~1))
-#define Tag_is_set(p) ((long)(p) & 1)
+#define Set_tag(p) ((value *) ((intnat)(p) | 1))
+#define Clear_tag(p) ((value *) ((intnat)(p) & ~1))
+#define Tag_is_set(p) ((intnat)(p) & 1)
#define BACKTRACK_STACK_BLOCK_SIZE 500
@@ -45,8 +45,8 @@ struct backtrack_stack {
};
#define Opcode(x) ((x) & 0xFF)
-#define Arg(x) ((unsigned long)(x) >> 8)
-#define SignedArg(x) ((long)(x) >> 8)
+#define Arg(x) ((uintnat)(x) >> 8)
+#define SignedArg(x) ((intnat)(x) >> 8)
enum {
CHAR, /* match a single character */
@@ -123,7 +123,7 @@ static int re_match(value re,
int accept_partial_match)
{
register value * pc;
- long instr;
+ intnat instr;
struct backtrack_stack * stack;
union backtrack_point * sp;
value cpool;