su_log.h, sl_utils.h: sanitized defining su_log_t.

darcs-hash:20060517130135-65a35-e13c44b4db40faac5c5555abfa874034ed60ddb6.gz

libsofia-sip-ua/nta/sofia-sip/sl_utils.h

@@ -37,12 +37,6 @@
 
 #include <stdio.h>
 
-#ifndef SU_LOG_H
-#define SU_LOG_H_NEED_SU_LOG_T 1
-#include <sofia-sip/su_log.h>
-#undef  SU_LOG_H_NEED_SU_LOG_T
-#endif
-
 #ifndef STRING0_H
 #include <sofia-sip/string0.h>
 #endif
@@ -53,6 +47,11 @@
 
 SOFIA_BEGIN_DECLS
 
+#ifndef SU_LOG_T
+#define SU_LOG_T
+typedef struct su_log_s su_log_t;
+#endif
+
 /* Read from file */
 SOFIAPUBFUN sip_payload_t *sl_read_payload(su_home_t *home, char const *fname);
 SOFIAPUBFUN sip_payload_t *sl_fread_payload(su_home_t *home, FILE *);

libsofia-sip-ua/su/sofia-sip/su_log.h

@@ -31,9 +31,10 @@
  *
  */
 
-#ifndef SU_LOG_T  /** Defined when su_log_t has been defined. */
+#ifndef SU_LOG_T
+/** Defined when the type #su_log_t has been defined. */
 #define SU_LOG_T
-/**Log object. */
+/** Type of log structure. */
 typedef struct su_log_s su_log_t;
 #endif
 
@@ -51,11 +52,6 @@ typedef struct su_log_s su_log_t;
 
 SOFIA_BEGIN_DECLS
 
-/* Use __attribute__ to allow argument checking for su_log */
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(x) 
-#endif
-
 /**Prototype for logging function */
 typedef void (su_logger_f)(void *stream, char const *fmt, va_list ap);