From 2fc97ebf1a9895514bc4e2fb7d72e832ff3e2760 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Thu, 14 Aug 2008 19:13:19 +0000
Subject: [PATCH]

---
 dev-lang/nasm/nasm-2.03.01-haiku.diff | 34 +++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/dev-lang/nasm/nasm-2.03.01-haiku.diff b/dev-lang/nasm/nasm-2.03.01-haiku.diff
index 60509577f..1879a2d66 100644
--- a/dev-lang/nasm/nasm-2.03.01-haiku.diff
+++ b/dev-lang/nasm/nasm-2.03.01-haiku.diff
@@ -1,7 +1,16 @@
 diff -urN nasm-2.03.01/float.h nasm-2.03.01-haiku/float.h
 --- nasm-2.03.01/float.h	2008-06-17 04:31:16.000000000 +0000
-+++ nasm-2.03.01-haiku/float.h	2008-08-14 09:44:37.000000000 +0000
-@@ -14,7 +14,7 @@
++++ nasm-2.03.01-haiku/float.h	2008-08-14 11:37:33.000000000 +0000
+@@ -10,11 +10,16 @@
+ #ifndef NASM_FLOAT_H
+ #define NASM_FLOAT_H
+ 
++#ifdef __HAIKU__
++  #include <stdint.h>
++  #include "nasm.h"
++#endif
++
+ enum float_round {
      FLOAT_RC_NEAR,
      FLOAT_RC_ZERO,
      FLOAT_RC_DOWN,
@@ -76,3 +85,24 @@ diff -urN nasm-2.03.01/pptok.h nasm-2.03.01-haiku/pptok.h
  };
  
  #define PP_COND(x)     ((enum pp_conditional)((x) & 0x1e))
+diff -urN nasm-2.03.01/quote.c nasm-2.03.01-haiku/quote.c
+--- nasm-2.03.01/quote.c	2008-06-17 04:31:16.000000000 +0000
++++ nasm-2.03.01-haiku/quote.c	2008-08-14 11:57:46.000000000 +0000
+@@ -197,7 +197,7 @@
+ 	st_backslash,
+ 	st_hex,
+ 	st_oct,
+-	st_ucs,
++	st_ucs
+     } state;
+     int ndig = 0;
+     int32_t nval = 0;
+@@ -392,7 +392,7 @@
+     char c;
+     enum unq_state {
+ 	st_start,
+-	st_backslash,
++	st_backslash
+     } state;
+ 
+     bq = str[0];