Unix fixes for free source julian code

modules/calendar/Makefile

@@ -1,6 +1,10 @@
 #! gmake
 
-NS_DEPTH = ..
+ifdef MOZ_TREX
+NS_DEPTH=../..
+else
+NS_DEPTH=..
+endif
 
 DEPTH = $(NS_DEPTH)
 

modules/calendar/src/Makefile

@@ -1,11 +1,20 @@
 #! gmake
 
-NS_DEPTH    = ../..
+ifdef MOZ_TREX
+NS_DEPTH=../../..
+else
+NS_DEPTH=../..
+endif
 
 DEPTH = $(NS_DEPTH)
 
 include $(NS_DEPTH)/config/config.mk
 
+ifdef MOZ_TREX
+DIRS    = libcal
+else
 DIRS    = libjulian
+endif
+
 
 include $(NS_DEPTH)/config/rules.mk

modules/calendar/src/libcal/Makefile

@@ -4,7 +4,11 @@ MODULE = julian
 
 LIBRARY_NAME = julian
 
-NS_DEPTH = ../../..
+ifdef MOZ_TREX
+NS_DEPTH=../../../..
+else
+NS_DEPTH=../../..
+endif
 
 DEPTH = $(NS_DEPTH)
 

modules/calendar/src/libcal/util/julnstr.cpp

@@ -826,7 +826,7 @@ void JulianString::URLEncode()
   if (m_iStrlen <= 0)
         return;
 
-  long iNewLen=0;
+  PRInt32 iNewLen=0;
   char* pSave = m_pBuf;
   char* p = PRIVATE_NET_EscapeBytes(m_pBuf, m_iStrlen, URL_XPALPHAS, &iNewLen);
   if (iNewLen > 0)