Fix FreeBSD build after merge of my changes from the ProjectK branch.

diff --git a/src/ToolBox/SOS/Strike/sildasm.cpp b/src/ToolBox/SOS/Strike/sildasm.cpp
index 6875436..c783787 100644 (file)
--- a/src/ToolBox/SOS/Strike/sildasm.cpp
+++ b/src/ToolBox/SOS/Strike/sildasm.cpp
@@ -624,6 +624,13 @@ void DecodeDynamicIL(BYTE *data, ULONG Size, DacpObjectData& tokenArray)
 
 /******************************************************************************/
 // CQuickBytes utilities
+#ifdef FEATURE_PAL
+// Don't need the implementations since sos references the dac module containing them.
+char* asString(CQuickBytes *out);
+void appendStr(CQuickBytes *out, const char* str, unsigned len = -1);
+void appendChar(CQuickBytes *out, char chr);
+void insertStr(CQuickBytes *out, const char* str);
+#else
 static char* asString(CQuickBytes *out) {
     SIZE_T oldSize = out->Size();
     out->ReSize(oldSize + 1);
@@ -658,6 +665,7 @@ static void insertStr(CQuickBytes *out, const char* str) {
     memcpy(out->Ptr(), str, len);  
         // Note no trailing null!   
 }
+#endif
 
 static void appendStrNum(CQuickBytes *out, int num) {
     char buff[16];  

diff --git a/src/inc/formattype.cpp b/src/inc/formattype.cpp
index e7d1394..05b4c86 100644 (file)
--- a/src/inc/formattype.cpp
+++ b/src/inc/formattype.cpp
@@ -11,7 +11,7 @@
 #include "formattype.h"
 
 /******************************************************************************/
-static char* asString(CQuickBytes *out) {
+char* asString(CQuickBytes *out) {
     CONTRACTL
     {
         THROWS;
@@ -27,7 +27,7 @@ static char* asString(CQuickBytes *out) {
     return((char*) out->Ptr()); 
 }
 
-static void appendStr(CQuickBytes *out, const char* str, unsigned len=(unsigned)-1) {
+void appendStr(CQuickBytes *out, const char* str, unsigned len) {
     CONTRACTL
     {
         THROWS;
@@ -43,7 +43,7 @@ static void appendStr(CQuickBytes *out, const char* str, unsigned len=(unsigned)
         // Note no trailing null!   
 }
 
-static void appendChar(CQuickBytes *out, char chr) {
+void appendChar(CQuickBytes *out, char chr) {
     CONTRACTL
     {
         THROWS;
@@ -57,7 +57,7 @@ static void appendChar(CQuickBytes *out, char chr) {
         // Note no trailing null!   
 }
 
-static void insertStr(CQuickBytes *out, const char* str) {
+void insertStr(CQuickBytes *out, const char* str) {
     CONTRACTL
     {
         THROWS;

diff --git a/src/inc/formattype.h b/src/inc/formattype.h
index 8f009c6..739bc89 100644 (file)
--- a/src/inc/formattype.h
+++ b/src/inc/formattype.h
@@ -31,6 +31,10 @@ char* DumpParamAttr(__inout_ecount(cchszString) char* szString,
                     DWORD cchszString, 
                     DWORD dwAttr);
 
+void appendStr(CQuickBytes *out, const char* str, unsigned len=(unsigned)-1);
+void insertStr(CQuickBytes *out, const char* str);
+char* asString(CQuickBytes *out);
+
 const char* PrettyPrintSig(
     PCCOR_SIGNATURE typePtr,            // type to convert,     
     unsigned typeLen,                                  // the lenght of 'typePtr'