From 62bee5eb3e7ceb23e7d7002cb3e0cccc2dc122d9 Mon Sep 17 00:00:00 2001 From: Kieu Tran Date: Tue, 30 Jun 2015 14:55:30 -0700 Subject: [PATCH 1/2] Updated nan to 1.8.4 --- package.json | 2 +- src/lzf/lzfP.h | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 022d7ba..3a90781 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "url": "git://github.com/Topface/node-lzf.git" }, "dependencies": { - "nan": "1.3.0" + "nan": "1.8.4" }, "directories": { "lib": "./lib" diff --git a/src/lzf/lzfP.h b/src/lzf/lzfP.h index 7b7feda..20c6e65 100644 --- a/src/lzf/lzfP.h +++ b/src/lzf/lzfP.h @@ -1,16 +1,16 @@ /* * Copyright (c) 2000-2007 Marc Alexander Lehmann - * + * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO @@ -143,12 +143,8 @@ using namespace std; #ifndef LZF_USE_OFFSETS # if defined (WIN32) # define LZF_USE_OFFSETS defined(_M_X64) -# else -# if __cplusplus > 199711L -# include # else # include -# endif # define LZF_USE_OFFSETS (UINTPTR_MAX > 0xffffffffU) # endif #endif @@ -182,4 +178,3 @@ typedef LZF_HSLOT LZF_STATE[1 << (HLOG)]; #endif #endif - From 88286c3a8f70bd6c38d59cb34b6bb99a7efd5a7b Mon Sep 17 00:00:00 2001 From: Kieu Tran Date: Wed, 1 Jul 2015 10:37:06 -0700 Subject: [PATCH 2/2] Reverted cstdint deletion, the header can be found under tr1 directory. --- src/lzf/lzfP.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lzf/lzfP.h b/src/lzf/lzfP.h index 20c6e65..dabb9e0 100644 --- a/src/lzf/lzfP.h +++ b/src/lzf/lzfP.h @@ -143,8 +143,12 @@ using namespace std; #ifndef LZF_USE_OFFSETS # if defined (WIN32) # define LZF_USE_OFFSETS defined(_M_X64) +# else +# if __cplusplus > 199711L +# include # else # include +# endif # define LZF_USE_OFFSETS (UINTPTR_MAX > 0xffffffffU) # endif #endif