From aee0039a2d6686ec78352125010ebb38a7a7d743 Mon Sep 17 00:00:00 2001
From: John Vilk <jvilk@cs.umass.edu>
Date: Thu, 4 Feb 2016 19:40:44 -0500
Subject: [PATCH] [node] Export Buffer and SlowBuffer from "buffer" module.

---
 node/node-tests.ts | 10 ++++++++++
 node/node.d.ts     |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/node/node-tests.ts b/node/node-tests.ts
index 8faf5fed6..1d0a321c6 100644
--- a/node/node-tests.ts
+++ b/node/node-tests.ts
@@ -16,6 +16,8 @@ import * as path from "path";
 import * as readline from "readline";
 import * as childProcess from "child_process";
 import * as os from "os";
+// Specifically test buffer module regression.
+import {Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer} from "buffer";
 
 assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
 
@@ -169,6 +171,14 @@ function bufferTests() {
         index = buffer.indexOf(23);
         index = buffer.indexOf(buffer);
     }
+
+    // Imported Buffer from buffer module works properly
+    {
+        let b = new ImportedBuffer('123');
+        b.writeUInt8(0, 6);
+        let sb = new ImportedSlowBuffer(43);
+        b.writeUInt8(0, 6);
+    }
 }
 
 
diff --git a/node/node.d.ts b/node/node.d.ts
index 8df3d16a7..7179464d1 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -411,6 +411,9 @@ interface NodeBuffer {
 ************************************************/
 declare module "buffer" {
     export var INSPECT_MAX_BYTES: number;
+    var BuffType: typeof Buffer;
+    var SlowBuffType: typeof SlowBuffer;
+    export { BuffType as Buffer, SlowBuffType as SlowBuffer };
 }
 
 declare module "querystring" {