small fixes

16 years ago · 70469dea2d
parent 7e65eccab8
commit 70469dea2d
2 changed files with 3 additions and 3 deletions
--- a/core/atomic_types.h
+++ b/core/atomic_types.h
@ -60,7 +60,7 @@ class atomic_int64
  
 public:
  void set(unsigned long long val) {
-#ifndef __LP64__ || !__LP64__
+#if !defined(__LP64__) || !__LP64__
    unsigned long long tmp_ll;
    do {
      tmp_ll = ll;
@ -72,7 +72,7 @@ public:
  }
  
  unsigned long long get() {
-#ifndef __LP64__ || !__LP64__
+#if !defined(__LP64__) || !__LP64__
    unsigned long long tmp_ll;
    do {
      tmp_ll = ll;
--- a/core/sip/resolver.cpp
+++ b/core/sip/resolver.cpp
@ -37,9 +37,9 @@
 #include <resolv.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h> 
-//#include <arpa/nameser_compat.h> // Darwin only

 #include <list>
+#include <algorithm>

 using std::pair;
 using std::list;