Changed #ifdefs from headers to if defined().

diff --git a/lib/silcmath/silcmp.h b/lib/silcmath/silcmp.h
index 72d71acb97459ed714c2114282f03d9600b3700a..da72aa9129a5dac36d62d2cae239f37382178828 100644 (file)
--- a/lib/silcmath/silcmp.h
+++ b/lib/silcmath/silcmp.h
@@ -34,7 +34,7 @@
 #ifndef SILCMP_H
 #define SILCMP_H
 
-#ifdef SILC_MP_GMP
+#if defined(SILC_MP_GMP)
 #include "mp_gmp.h"            /* SILC_MP_GMP */
 #else
 #include "mp_mpi.h"            /* SILC_MP_NSS_MPI */

diff --git a/lib/silcutil/silcbuffer.h b/lib/silcutil/silcbuffer.h
index 6aa197fda40df74534ab77b76235adef9420b709..b84630446ee9b9924d007b12c04bb2159c068dfc 100644 (file)
--- a/lib/silcutil/silcbuffer.h
+++ b/lib/silcutil/silcbuffer.h
@@ -209,7 +209,7 @@ static inline
 void silc_buffer_free(SilcBuffer sb)
 {
   if (sb) {
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
     memset(sb->head, 'F', sb->truelen);
 #endif
     silc_free(sb->head);
@@ -275,7 +275,7 @@ unsigned char *silc_buffer_pull(SilcBuffer sb, SilcUInt32 len)
 {
   unsigned char *old_data = sb->data;
 
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
   assert(len <= (SilcUInt32)(sb->tail - sb->data));
 #endif
 
@@ -318,7 +318,7 @@ unsigned char *silc_buffer_push(SilcBuffer sb, SilcUInt32 len)
 {
   unsigned char *old_data = sb->data;
 
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
   assert((sb->data - len) >= sb->head);
 #endif
 
@@ -361,7 +361,7 @@ unsigned char *silc_buffer_pull_tail(SilcBuffer sb, SilcUInt32 len)
 {
   unsigned char *old_tail = sb->tail;
 
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
   assert((SilcUInt32)(sb->end - sb->tail) >= len);
 #endif
 
@@ -404,7 +404,7 @@ unsigned char *silc_buffer_push_tail(SilcBuffer sb, SilcUInt32 len)
 {
   unsigned char *old_tail = sb->tail;
 
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
   assert((sb->tail - len) >= sb->data);
 #endif
 
@@ -443,7 +443,7 @@ unsigned char *silc_buffer_put_head(SilcBuffer sb,
                                    const unsigned char *data,
                                    SilcUInt32 len)
 {
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
   assert((SilcUInt32)(sb->data - sb->head) >= len);
 #endif
   return (unsigned char *)memcpy(sb->head, data, len);
@@ -478,7 +478,7 @@ unsigned char *silc_buffer_put(SilcBuffer sb,
                               const unsigned char *data,
                               SilcUInt32 len)
 {
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
   assert((SilcUInt32)(sb->tail - sb->data) >= len);
 #endif
   return (unsigned char *)memcpy(sb->data, data, len);
@@ -513,7 +513,7 @@ unsigned char *silc_buffer_put_tail(SilcBuffer sb,
                                    const unsigned char *data,
                                    SilcUInt32 len)
 {
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
   assert((SilcUInt32)(sb->end - sb->tail) >= len);
 #endif
   return (unsigned char *)memcpy(sb->tail, data, len);

diff --git a/lib/silcutil/silcdlist.h b/lib/silcutil/silcdlist.h
index 0921a2b78e08ee1f3af53dc24050f57f4b07573e..d9f6d55267bfd19cbe45526237c4d5381b28a1c6 100644 (file)
--- a/lib/silcutil/silcdlist.h
+++ b/lib/silcutil/silcdlist.h
@@ -202,7 +202,7 @@ void silc_dlist_del(SilcDList list, void *context)
   while ((e = (SilcDListEntry)silc_list_get(list->list)) != SILC_LIST_END) {
     if (e->context == context) {
       silc_list_del(list->list, e);
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
       memset(e, 'F', sizeof(*e));
 #endif
       silc_free(e);

diff --git a/lib/silcutil/silclog.h b/lib/silcutil/silclog.h
index 7a948faab7deffeec0d13a9342aa711dc2b3da7b..97d4d393b0c890e2626b5835fcc75bb15c800df4 100644 (file)
--- a/lib/silcutil/silclog.h
+++ b/lib/silcutil/silclog.h
@@ -236,7 +236,7 @@ extern DLLAPI bool silc_debug_hexdump;
 
 /* Macros */
 
-#ifdef SILC_WIN32
+#if defined(SILC_WIN32)
 #ifndef __FUNCTION__
 #define __FUNCTION__ ""
 #endif
@@ -343,7 +343,7 @@ extern DLLAPI bool silc_debug_hexdump;
  *
  * SOURCE
  */
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
 #define SILC_LOG_DEBUG(fmt) silc_log_output_debug(__FILE__, \
                                __FUNCTION__, \
                                __LINE__, \
@@ -383,7 +383,7 @@ extern DLLAPI bool silc_debug_hexdump;
  *
  * SOURCE
  */
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG)
 #define SILC_LOG_HEXDUMP(fmt, data, len) silc_log_output_hexdump(__FILE__, \
                                __FUNCTION__, \
                                __LINE__, \

diff --git a/lib/silcutil/silcmutex.h b/lib/silcutil/silcmutex.h
index e1f1b26ce9816cc308e0e057d49be1ab684de229..27b229fa099a2dd23675e19681f57d833c63a7bc 100644 (file)
--- a/lib/silcutil/silcmutex.h
+++ b/lib/silcutil/silcmutex.h
@@ -31,7 +31,7 @@
 #ifndef SILCMUTEX_H
 #define SILCMUTEX_H
 
-#ifdef SILC_THREADS
+#if defined(SILC_THREADS)
 
 /****s* silcutil/SilcMutexAPI/SilcMutex
  *

diff --git a/lib/silcutil/silcnet.h b/lib/silcutil/silcnet.h
index 26e00454ae149e28e654cbfead85ae3638a8573c..429d7cee7287cfb64e0746269d5e4094ee1ff61a 100644 (file)
--- a/lib/silcutil/silcnet.h
+++ b/lib/silcutil/silcnet.h
@@ -419,7 +419,7 @@ char *silc_net_localhost(void);
  ***/
 char *silc_net_localip(void);
 
-#ifdef SILC_WIN32
+#if defined(SILC_WIN32)
 
 /****f* silcutil/SilcNetAPI/silc_net_win32_init
  *