SF.net SVN: frontierkernel: [1779] Frontier/branches/IUDA_Desktop/Common/ source

[<cre...@us...>]

Revision: 1779
          http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1779&view=rev
Author:   creecode
Date:     2007-11-06 19:42:13 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
added ifdefs for IUDA Desktop target

Modified Paths:
--------------
    Frontier/branches/IUDA_Desktop/Common/source/langhtml.c
    Frontier/branches/IUDA_Desktop/Common/source/threads.c

Modified: Frontier/branches/IUDA_Desktop/Common/source/langhtml.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/langhtml.c	2007-11-07 03:08:17 UTC (rev 1778)
+++ Frontier/branches/IUDA_Desktop/Common/source/langhtml.c	2007-11-07 03:42:13 UTC (rev 1779)
@@ -141,22 +141,21 @@
 
 #define STR_P_flprocessmacrosintags     BIGSTRING ("\x17" "processmacrosinhtmltags")
 
-
 #ifdef PIKE
 
 	#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
 	
-		#ifdef IUDADESKTOP // 2007-10-27 creedon
+		#ifdef IUDADESKTOP
 		
 			#define STR_P_SERVERSTRING BIGSTRING ("\x13" "IUDA Desktop/^0-^1X")
 			
-		#endif
+		#endif // IUDADESKTOP
 		
 		#ifdef OPMLEDITOR // 2005-04-06 dluebbert
 		
 			#define STR_P_SERVERSTRING BIGSTRING ("\x0b" "OPML/^0-^1X")
 			
-		#endif
+		#endif // OPMLEDITOR
 		
 	#else
 	
@@ -164,13 +163,12 @@
 
 	#endif
 	
-#else
+#else // !PIKE
 
 	#define STR_P_SERVERSTRING BIGSTRING ("\x0f" "Frontier/^0-^1X") // 2005-01-04 creedon - removed UserLand for open source release
 	
-#endif // #ifdef PIKE
+#endif // !PIKE
 
-
 #define STR_P_RESPONDERERROR			BIGSTRING ("\x16" "Responder method error")
 #define STR_P_LOGADD					BIGSTRING ("\x16" "log.addToGuestDatabase")
 #define STR_P_USERWEBSERVERCONFIG		BIGSTRING ("\x15" "user.webserver.config")

Modified: Frontier/branches/IUDA_Desktop/Common/source/threads.c
===================================================================
--- Frontier/branches/IUDA_Desktop/Common/source/threads.c	2007-11-07 03:08:17 UTC (rev 1778)
+++ Frontier/branches/IUDA_Desktop/Common/source/threads.c	2007-11-07 03:42:13 UTC (rev 1779)
@@ -195,17 +195,35 @@
 	#endif // MACVERSION
 
 	#ifdef WIN95VERSION
-	
-	#ifdef PIKE
-	#ifndef OPMLEDITOR
-		hsharedthreadglobals = CreateMutex (NULL, false, "Pike Thread Globals");
-	#else  // OPMLEDITOR
-		hsharedthreadglobals = CreateMutex (NULL, false, "OPML Thread Globals");
-	#endif // !OPMLEDITOR
-	#else // !PIKE
-		hsharedthreadglobals = CreateMutex (NULL, false, "Frontier Thread Globals");
-	#endif //!PIKE
-	
+
+		#ifdef PIKE
+
+			#if defined ( IUDADESKTOP ) || defined ( OPMLEDITOR )
+
+				#ifdef IUDADESKTOP // 2007-10-27 creedon
+					
+					hsharedthreadglobals = CreateMutex (NULL, false, "IUDA Desktop Thread Globals");
+
+				#endif
+				
+				#ifdef OPMLEDITOR
+				
+				hsharedthreadglobals = CreateMutex (NULL, false, "OPML Thread Globals");
+					
+				#endif
+				
+			#else // Radio UserLand
+			
+				hsharedthreadglobals = CreateMutex (NULL, false, "Pike Thread Globals");
+
+			#endif
+			
+		#else // Frontier
+
+			hsharedthreadglobals = CreateMutex (NULL, false, "Frontier Thread Globals");
+
+		#endif // #ifdef PIKE
+
 		ixlocalthreadglobals = TlsAlloc ();
 		
 		if (ixlocalthreadglobals == (DWORD) -1) {
@@ -234,7 +252,7 @@
 	
 		return (true);
 
-	#endif
+	#endif // WIN95VERSION
 
 	} // initmainthread
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.