Changeset 621:04dbea46c7a2 in freeDiameter for include/freeDiameter/freeDiameter.h

Timestamp:

Dec 7, 2010, 11:13:58 AM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Cleanup many SWIG definitions from main .h files

File:

• include/freeDiameter/freeDiameter.h (modified) (6 diffs)

include/freeDiameter/freeDiameter.h

@@ -47 +47 @@
 #endif /* GNUTLS_VERSION */
 
-#ifndef SWIG
 /* GNUTLS calls debug level */
 #ifndef GNUTLS_DBG_LEVEL
@@ -69 +68 @@
         (__call__);                                                     \
 }
-#endif /* !SWIG */
 
 /* Structure to hold the configuration of the freeDiameter daemon */
@@ -128 +126 @@
         struct fifo       *cnf_main_ev; /* events for the daemon's main (struct fd_event items) */
 };
-#ifdef SWIG
-%immutable;
-#endif /* SWIG */
 extern struct fd_config *fd_g_config; /* The pointer to access the global configuration, initalized in main */
-#ifdef SWIG
-%mutable;
-#endif /* SWIG */
 
 
@@ -182 +174 @@
         , "STATE_ZOMBIE"                \
         };
-#ifndef SWIG
 extern const char *peer_state_str[];
-#else /* SWIG */
-%immutable;
-extern const char **peer_state_str;
-%mutable;
-#endif /* !SWIG */
 #define STATE_STR(state) \
         (((unsigned)(state)) <= STATE_MAX ? peer_state_str[((unsigned)(state)) ] : "<Invalid>")
@@ -697 +683 @@
         struct fd_list  chain;  /* link in cnf_endpoints list */
         
-#ifndef SWIG
         union {
                 sSS             ss;     /* the socket information. List is always ordered by ss value (memcmp) -- see fd_ep_add_merge */
@@ -703 +688 @@
                 sSA6            sin6;
                 sSA             sa;
-        };
-#else /* !SWIG */
-        /* SWIG does not support unions inside struct, we only define sa in this case */
-        sSA             sa;
-#endif /* !SWIG */
+        }
+#ifdef SWIG /* nested anonymous unions are not supported yet */
+                        s
+#endif /* SWIG */
+        ;
         
 #define EP_FL_CONF      (1 << 0)        /* This endpoint is statically configured in a configuration file */