Branch HEAD

Avoid duplicate definition of SYSIO_INTERFACE_NAME.
b=11175
r=nic (original patch)

diff --git a/libsysio/include/sysio-cmn.h b/libsysio/include/sysio-cmn.h
index 07b3339..ed9a2c1 100644 (file)
--- a/libsysio/include/sysio-cmn.h
+++ b/libsysio/include/sysio-cmn.h
@@ -98,12 +98,14 @@ struct iovec;
 /*
  * SYSIO name label macros
  */
 /*
  * SYSIO name label macros
  */

+#ifndef SYIO_INTERFACE_NAME

 #ifdef SYSIO_LABEL_NAMES
 #define SYSIO_INTERFACE_NAME(x) \
        PREPEND(SYSIO_LABEL_NAMES, x)
 #else
 #define SYSIO_INTERFACE_NAME(x) x
 #ifdef SYSIO_LABEL_NAMES
 #define SYSIO_INTERFACE_NAME(x) \
        PREPEND(SYSIO_LABEL_NAMES, x)
 #else
 #define SYSIO_INTERFACE_NAME(x) x

-#endif
+#endif /* SYSIO_LABEL_NAMES */
+#endif /* SYSIO_INTERFACE_NAME */

 
 /* for debugging */
 #if 0
 
 /* for debugging */
 #if 0