[Libsysio-commit] HEAD: libsysio/include sysio-cmn.h

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3658/include

Modified Files:
	sysio-cmn.h 
Log Message:


Merge in with-alternate-symbols modifications from LLNL_HPSS branch. This
allows prepending public symbols with something other than "sysio_". However,
the changes are backward compatible. I.e., the default is still to use
"sysio_".


Index: sysio-cmn.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/sysio-cmn.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -b -B -p -r1.7 -r1.8
--- sysio-cmn.h	15 Sep 2005 21:46:23 -0000	1.7
+++ sysio-cmn.h	19 Oct 2005 19:30:56 -0000	1.8
@@ -92,13 +92,13 @@ struct iovec;
 /*
  * SYSIO name label macros
  */
-#define XPREPEND(p,x) p ## x
-#define PREPEND(p,x) XPREPEND(p,x)
-#ifndef SYSIO_LABEL_NAMES
-#define SYSIO_LABEL_NAMES 0
-#endif
-#if SYSIO_LABEL_NAMES
-#define SYSIO_INTERFACE_NAME(x) PREPEND(sysio_, x)
+#ifdef SYSIO_LABEL_NAMES
+#define _PREPEND_HELPER(p, x) \
+	p ## x
+#define PREPEND(p, x) \
+	_PREPEND_HELPER(p, x)
+#define SYSIO_INTERFACE_NAME(x) \
+	PREPEND(SYSIO_LABEL_NAMES, x)
 #else
 #define SYSIO_INTERFACE_NAME(x) x
 #endif