Bug 411256 - "AIX linker error for trunk build xpcom module :ERROR: Undefined symbol: .PR_dtoa" (Remove standalone glue dependencies on NSPR) [p=benjamin@smedbergs.us (Benjamin Smedberg [bsmedberg]) r=dwitte a1.9=schrep]

xpcom/glue/nsID.cpp

@@ -118,6 +118,8 @@ PRBool nsID::Parse(const char *aIDStr)
   return expectFormat1 ? *aIDStr == '}' : PR_TRUE;
 }
 
+#ifndef XPCOM_GLUE_AVOID_NSPR
+
 /*
  * Returns an allocated string in {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}
  * format. The string is allocated with PR_Malloc and should be freed by
@@ -147,3 +149,4 @@ void nsID::ToProvidedString(char (&dest)[NSID_LENGTH]) const
               (PRUint32) m3[6], (PRUint32) m3[7]);
 }
 
+#endif // XPCOM_GLUE_AVOID_NSPR

xpcom/glue/nsID.h

@@ -94,6 +94,7 @@ struct nsID {
    */
   NS_COM_GLUE PRBool Parse(const char *aIDStr);
 
+#ifndef XPCOM_GLUE_AVOID_NSPR
   /**
    * nsID string encoder. Returns an allocated string in 
    * {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx} format. Caller should free string.
@@ -107,6 +108,9 @@ struct nsID {
    * buffer provided by the caller (for instance, on the stack).
    */
   NS_COM_GLUE void ToProvidedString(char (&dest)[NSID_LENGTH]) const;
+
+#endif // XPCOM_GLUE_AVOID_NSPR
+
   //@}
 };
 

xpcom/glue/nsTextFormatter.h

@@ -69,6 +69,9 @@
 #include "nscore.h"
 #include "nsStringGlue.h"
 
+#ifdef XPCOM_GLUE
+#error "nsTextFormatter is not available in the standalone glue due to NSPR dependencies."
+#endif
 
 class NS_COM_GLUE nsTextFormatter {
 

xpcom/glue/objs.mk

@@ -65,7 +65,6 @@ XPCOM_GLUE_SRC_LCPPSRCS =        \
   nsTObserverArray.cpp           \
   nsCycleCollectionParticipant.cpp \
   nsDeque.cpp \
-  nsTextFormatter.cpp \
   $(NULL)
 
 XPCOM_GLUE_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/, $(XPCOM_GLUE_SRC_LCPPSRCS))
@@ -78,6 +77,7 @@ XPCOM_GLUENS_SRC_LCPPSRCS =      \
   nsAutoLock.cpp                 \
   nsGenericFactory.cpp           \
   nsProxyRelease.cpp             \
+  nsTextFormatter.cpp            \
   $(NULL)
 
 XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS))