rev 256 - trunk/src

Author: mark
Date: 2004-04-02 01:26:58 -0500 (Fri, 02 Apr 2004)
New Revision: 256

Modified:
   trunk/src/builtins-core.c
   trunk/src/builtins-float.c
   trunk/src/init.pth
   trunk/src/main.c
   trunk/src/src.vcproj
Log:
fixed win32 compile


Modified: trunk/src/builtins-core.c
===================================================================
--- trunk/src/builtins-core.c	2004-04-02 05:14:44 UTC (rev 255)
+++ trunk/src/builtins-core.c	2004-04-02 06:26:58 UTC (rev 256)
@@ -68,7 +68,6 @@
  * This is here for a reason, so that the builtin's can be loaded (this is
  * the key for the start of the pointers to the functions for all the
  * builtins). */
-PR_PLACE_IN_SECTION(dll_initcall_t,start_dll_entry_ptr, "._module_init") = 0;
 
 MODULE_DECLARE(Object);
 MODULE_DECLARE(False);

Modified: trunk/src/builtins-float.c
===================================================================
--- trunk/src/builtins-float.c	2004-04-02 05:14:44 UTC (rev 255)
+++ trunk/src/builtins-float.c	2004-04-02 06:26:58 UTC (rev 256)
@@ -55,6 +55,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <math.h>
 
 #include <apr_strings.h>
 

Modified: trunk/src/init.pth
===================================================================
--- trunk/src/init.pth	2004-04-02 05:14:44 UTC (rev 255)
+++ trunk/src/init.pth	2004-04-02 06:26:58 UTC (rev 256)
@@ -3,16 +3,12 @@
 
 # This is loaded automatically whenever prothon loads
 
-# these are added to sys.path
+# these are added to Sys.path
 
-c:\prothon\modules\float\release
-c:\prothon\modules\string\release
 c:\prothon\modules\file\release
 c:\prothon\modules\re\release
-c:\prothon\modules\tuple\release
-c:\prothon\modules\list\release
 
-# this is executed before Main as module PthMod1
+# this is executed before Main1 as module PthMod1
 
-import Float, String, File, Re, Tuple
+import File, Re
 
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2004-04-02 05:14:44 UTC (rev 255)
+++ trunk/src/main.c	2004-04-02 06:26:58 UTC (rev 256)
@@ -75,6 +75,8 @@
 
 static apr_pool_t *apr_root_pool = NULL;
 
+PR_PLACE_IN_SECTION(dll_initcall_t,start_dll_entry_ptr, "._module_init") = 0;
+
 //**************************** get_pr_head_pool *******************************
 apr_pool_t* get_pr_head_pool(void) {
 	if (!apr_root_pool) {
@@ -82,6 +84,7 @@
 		pr_exit(1);
 	}
 	return apr_root_pool;
+
 }
 
 static obj_p new_thread_object;

Modified: trunk/src/src.vcproj
===================================================================
--- trunk/src/src.vcproj	2004-04-02 05:14:44 UTC (rev 255)
+++ trunk/src/src.vcproj	2004-04-02 06:26:58 UTC (rev 256)
@@ -131,52 +131,70 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="argproc.c">
+				RelativePath=".\argproc.c">
 			</File>
 			<File
-				RelativePath="builtins.c">
+				RelativePath=".\builtins-core.c">
 			</File>
 			<File
-				RelativePath="clist.c">
+				RelativePath=".\builtins-dict.c">
 			</File>
 			<File
-				RelativePath="console.c">
+				RelativePath=".\builtins-float.c">
 			</File>
 			<File
-				RelativePath="getline.c">
+				RelativePath=".\builtins-int.c">
 			</File>
 			<File
-				RelativePath="interp.c">
+				RelativePath=".\builtins-list.c">
 			</File>
 			<File
-				RelativePath="lock.c">
+				RelativePath=".\builtins-string.c">
 			</File>
 			<File
+				RelativePath=".\builtins-tuple.c">
+			</File>
+			<File
+				RelativePath=".\clist.c">
+			</File>
+			<File
+				RelativePath=".\console.c">
+			</File>
+			<File
+				RelativePath=".\getline.c">
+			</File>
+			<File
+				RelativePath=".\interp.c">
+			</File>
+			<File
+				RelativePath=".\lock.c">
+			</File>
+			<File
 				RelativePath=".\main.c">
 			</File>
 			<File
-				RelativePath="memory_mgr.c">
+				RelativePath=".\memory_mgr.c">
 			</File>
 			<File
-				RelativePath="object.c">
+				RelativePath=".\object.c">
 			</File>
 			<File
-				RelativePath="parser.c">
+				RelativePath=".\parser.c">
 			</File>
 			<File
-				RelativePath="parser_routines.c">
+				RelativePath=".\parser_routines.c">
 			</File>
 			<File
-				RelativePath="prmalloc.c">
+				RelativePath=".\prmalloc.c">
 			</File>
 			<File
-				RelativePath="symbol.c">
+				RelativePath=".\symbol.c">
 			</File>
 			<File
-				RelativePath="sys.c">
+				RelativePath=".\sys.c">
 			</File>
 			<File
-				RelativePath="thread.c">
+				RelativePath=".\thread.c">
 			</File>
 		</Filter>
 		<Filter