diff --git a/mozilla/security/nss/cmd/crlutil/crlgen_lex.c b/mozilla/security/nss/cmd/crlutil/crlgen_lex.c
index 6788395909a..0fc18eb34d5 100644
--- a/mozilla/security/nss/cmd/crlutil/crlgen_lex.c
+++ b/mozilla/security/nss/cmd/crlutil/crlgen_lex.c
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/befator/cvs/jail/cvsroot/mozilla/security/nss/cmd/crlutil/crlgen_lex.c,v 1.1 2005-04-12 02:24:14 alexei.volkov.bugs%sun.com Exp $
+ * $Header: /home/befator/cvs/jail/cvsroot/mozilla/security/nss/cmd/crlutil/crlgen_lex.c,v 1.2 2009-02-04 23:23:40 alexei.volkov.bugs%sun.com Exp $
  */
 
 #define FLEX_SCANNER
@@ -9,11 +9,12 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
-#ifndef _WIN32
+#ifdef _WIN32
+#include <io.h>
+#else
 #include <unistd.h>
 #endif
 
-
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
 #ifdef c_plusplus
 #ifndef __cplusplus
@@ -21,7 +22,6 @@
 #endif
 #endif
 
-
 #ifdef __cplusplus
 
 #include <stdlib.h>
diff --git a/mozilla/security/nss/cmd/crlutil/crlgen_lex_fix.sed b/mozilla/security/nss/cmd/crlutil/crlgen_lex_fix.sed
index 57125cd4aef..603dd2d1bea 100644
--- a/mozilla/security/nss/cmd/crlutil/crlgen_lex_fix.sed
+++ b/mozilla/security/nss/cmd/crlutil/crlgen_lex_fix.sed
@@ -1,4 +1,6 @@
 /<unistd.h>/ {
-        i #ifndef _WIN32
+        i #ifdef _WIN32
+	i #include <io.h>
+	i #else
         a #endif
 }