Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated nan to 1.8.4 to work with io.js v2.3.1 #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated nan to 1.8.4 to work with io.js v2.3.1 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62bee5e
Updated nan to 1.8.4
kieut Jun 30, 2015
88286c3
Reverted cstdint deletion, the header can be found under tr1 directory.
kieut Jul 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"url": "git://github.com/Topface/node-lzf.git"
},
"dependencies": {
"nan": "1.3.0"
"nan": "1.8.4"
},
"directories": {
"lib": "./lib"
Expand Down
11 changes: 5 additions & 6 deletions src/lzf/lzfP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/*
* Copyright (c) 2000-2007 Marc Alexander Lehmann <[email protected]>
*
*
* 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
Expand Down Expand Up @@ -145,7 +145,7 @@ using namespace std;
# define LZF_USE_OFFSETS defined(_M_X64)
# else
# if __cplusplus > 199711L
# include <cstdint>
# include <tr1/cstdint>
# else
# include <stdint.h>
# endif
Expand Down Expand Up @@ -182,4 +182,3 @@ typedef LZF_HSLOT LZF_STATE[1 << (HLOG)];
#endif

#endif