summaryrefslogtreecommitdiffstats
path: root/pack.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-10 07:17:53 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-10 07:17:53 +0000
commitdf6547cb7f160eaa3bc69d41a055b2c33ffc0e93 (patch)
treeb10b6489ef3dee4fc819499d3731bc66f8b8f21e /pack.c
parent600e26720e2f505dece5fc96f36ab51580a67f8c (diff)
downloadruby-df6547cb7f160eaa3bc69d41a055b2c33ffc0e93.tar.gz
ruby-df6547cb7f160eaa3bc69d41a055b2c33ffc0e93.tar.xz
ruby-df6547cb7f160eaa3bc69d41a055b2c33ffc0e93.zip
* dir.c (rb_glob2): do not allocate buffer from heap to avoid
memory leaks. use string object for buffering instead. [ruby-dev:24738] * dir.c (join_path): ditto. * io.c (io_read): external input buffer may be modified even after rb_str_locktmp(). [ruby-dev:24735] * dir.c (fnmatch): p or s may be NULL. [ruby-dev:24749] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'pack.c')
-rw-r--r--pack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pack.c b/pack.c
index 5e7ae09e2..9a83dc704 100644
--- a/pack.c
+++ b/pack.c
@@ -175,7 +175,7 @@ define_swapx(d, double)
#endif /* #if SIZEOF_LONG == 8 */
#else /* SIZEOF_DOUBLE != 8 */
define_swapx(d, double)
-#endif /* #if SIZEOF_DPOUBLE == 8 */
+#endif /* #if SIZEOF_DOUBLE == 8 */
#undef define_swapx
@@ -248,7 +248,7 @@ endian()
#define hton32(x) (x)
# endif
#else /* LITTLE ENDIAN */
-#ifndef ntohs
+#ifdef ntohs
#undef ntohs
#undef ntohl
#undef htons