Changeset 1922

Timestamp:

Apr 26, 2005, 4:59:01 AM (20 years ago)

Author:

bird

Message:

Hide and initialize everything.

File:

• trunk/src/emx/include/sys/sysctl.h (modified) (6 diffs, 1 prop)

trunk/src/emx/include/sys/sysctl.h

@@ -168 +168 @@
 
 #ifdef __INNOTEK_LIBC__
-#define sysctl_handle_int       __sysctl_handle_int
-#define sysctl_handle_long      __sysctl_handle_long
-#define sysctl_handle_intptr    __sysctl_handle_intptr
-#define sysctl_handle_string    __sysctl_handle_string
-#define sysctl_handle_opaque    __sysctl_handle_opaque
+#define sysctl_handle_int       __libc_sysctl_handle_int
+#define sysctl_handle_long      __libc_sysctl_handle_long
+#define sysctl_handle_intptr    __libc_sysctl_handle_intptr
+#define sysctl_handle_string    __libc_sysctl_handle_string
+#define sysctl_handle_opaque    __libc_sysctl_handle_opaque
 #endif
 
@@ -191 +191 @@
 /* Declare a static oid to allow child oids to be added to it. */
 #define SYSCTL_DECL(name)                                       \
-        extern struct sysctl_oid_list __sysctl_##name##_children
+        extern struct sysctl_oid_list __libc_sysctl_##name##_children
 
 /* Hide these in macros */
@@ -199 +199 @@
         (oid_ptr)->oid_arg1 = (val);
 #define SYSCTL_STATIC_CHILDREN(oid_name) \
-        (&__sysctl_##oid_name##_children)
+        (&__libc_sysctl_##oid_name##_children)
 
 /* === Structs and macros related to context handling === */
@@ -212 +212 @@
 
 #define SYSCTL_NODE_CHILDREN(parent, name) \
-        __sysctl_##parent##_##name##_children
+        __libc_sysctl_##parent##_##name##_children
 
 #undef DATA_SET
-#define DATA_SET(set, data) __asm__ (".stabs \"___" #set "__\", 25, 0, 0, _" #data)
+#define DATA_SET(set, data) __asm__ (".stabs \"___libc_" #set "__\", 25, 0, 0, _" #data)
 
 /* This constructs a "raw" MIB oid. */
 #define SYSCTL_OID(parent, nbr, name, kind, a1, a2, handler, fmt, descr) \
-        static struct sysctl_oid __sysctl__##parent##_##name = {                 \
-                &__sysctl_##parent##_children, { &__sysctl__##parent##_##name },                         \
+        static struct sysctl_oid __libc_sysctl__##parent##_##name = {            \
+                &__libc_sysctl_##parent##_children, { &__libc_sysctl__##parent##_##name },                       \
                 nbr, kind, a1, a2, #name, handler, fmt, 0, descr };      \
-        DATA_SET(sysctl_set, __sysctl__##parent##_##name)
+        DATA_SET(sysctl_set, __libc_sysctl__##parent##_##name)
 
 
@@ -230 +230 @@
 /* This constructs a node from which other oids can hang. */
 #define SYSCTL_NODE(parent, nbr, name, access, handler, descr)              \
-        struct sysctl_oid_list SYSCTL_NODE_CHILDREN(parent, name);          \
+        struct sysctl_oid_list SYSCTL_NODE_CHILDREN(parent, name) = {0};    \
         SYSCTL_OID(parent, nbr, name, CTLTYPE_NODE|(access),                \
                    (void*)&SYSCTL_NODE_CHILDREN(parent, name), 0, handler, \
@@ -599 +599 @@
  * Declare some common oids.
  */
-#define sysctl__children __sysctl__children
+#define sysctl__children __libc_sysctl__children
 extern struct sysctl_oid_list sysctl__children;
 SYSCTL_DECL(_kern);