Skip to content
Snippets Groups Projects
Commit b2675183 authored by toy's avatar toy
Browse files

o Sun C doesn't like "const char const* argv0arg". Make is just const

  char*
o Sun C doesn't like "char *str = *++argptr".  Fix that.
o Clean up a few warnings.
parent d85c9330
No related branches found
No related tags found
No related merge requests found
/* /*
* main() entry point for a stand alone lisp image. * main() entry point for a stand alone lisp image.
* *
* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/lisp.c,v 1.37 2003/09/04 14:22:01 toy Exp $ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/lisp.c,v 1.38 2003/10/13 17:25:09 toy Exp $
* *
*/ */
...@@ -111,7 +111,7 @@ static char* cmucllib_search_list[] = ...@@ -111,7 +111,7 @@ static char* cmucllib_search_list[] =
* default for CMUCLLIB * default for CMUCLLIB
*/ */
char * char *
default_cmucllib(const char const* argv0arg) default_cmucllib(const char* argv0arg)
{ {
char* p; char* p;
char* defpath; char* defpath;
...@@ -389,7 +389,7 @@ int main(int argc, char *argv[], char *envp[]) ...@@ -389,7 +389,7 @@ int main(int argc, char *argv[], char *envp[])
lispobj initial_function = 0; lispobj initial_function = 0;
if (builtin_image_flag != 0) if (builtin_image_flag != 0)
initial_function = &initial_function_addr; initial_function = (lispobj) &initial_function_addr;
#if defined(SVR4) || defined(__linux__) #if defined(SVR4) || defined(__linux__)
tzset(); tzset();
...@@ -437,7 +437,9 @@ int main(int argc, char *argv[], char *envp[]) ...@@ -437,7 +437,9 @@ int main(int argc, char *argv[], char *envp[])
} }
else if (strcmp(arg, "-dynamic-space-size") == 0) else if (strcmp(arg, "-dynamic-space-size") == 0)
{ {
char *str = *++argptr; char *str;
str = *++argptr;
if (str == NULL) if (str == NULL)
{ {
fprintf(stderr, "-dynamic-space-size must be followed by the size to use in MBytes.\n"); fprintf(stderr, "-dynamic-space-size must be followed by the size to use in MBytes.\n");
...@@ -574,11 +576,11 @@ int main(int argc, char *argv[], char *envp[]) ...@@ -574,11 +576,11 @@ int main(int argc, char *argv[], char *envp[])
if(builtin_image_flag != 0) { if(builtin_image_flag != 0) {
extern int image_dynamic_space_size; extern int image_dynamic_space_size;
int allocation_pointer = dynamic_0_space + (int)&image_dynamic_space_size; long allocation_pointer = (long) dynamic_0_space + (int)&image_dynamic_space_size;
#ifdef i386 #ifdef i386
SetSymbolValue(ALLOCATION_POINTER, (lispobj)allocation_pointer); SetSymbolValue(ALLOCATION_POINTER, (lispobj)allocation_pointer);
#else #else
current_dynamic_space_free_pointer = (lispobj)allocation_pointer; current_dynamic_space_free_pointer = (lispobj*)allocation_pointer;
#endif #endif
} else { } else {
initial_function = load_core_file(core); initial_function = load_core_file(core);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment