[LIBIBMAD] protect against duplicate definitions.
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Mon, 26 Jan 2009 21:00:09 +0000 (21:00 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Mon, 26 Jan 2009 21:00:09 +0000 (21:00 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1889 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

ulp/libibmad/include/infiniband/mad_osd.h

index 8586f99..1308f88 100644 (file)
@@ -53,9 +53,13 @@ typedef unsigned __int64     uint64_t;
 #endif\r
 \r
 #define bswap_64       _byteswap_uint64\r
-#define getpid()       GetCurrentProcessId()\r
+#if !defined(getpid)\r
+  #define getpid()     GetCurrentProcessId()\r
+#endif\r
 #define snprintf       _snprintf\r
+#if !defined(strtoull)\r
 #define strtoull       _strtoui64\r
+#endif\r
 #define __func__       __FUNCTION__\r
 #define random         rand\r
 #define srandom                srand\r