The R Project SVN R

Rev

Rev 30599 | Rev 30832 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 30599 Rev 30604
Line 146... Line 146...
146 
	if(dll.type != FILENAME) {
 146 
	if(dll.type != FILENAME) {
147 
	    *fun = R_FindNativeSymbolFromDLL(buf, &dll, symbol);
 147 
	    *fun = R_FindNativeSymbolFromDLL(buf, &dll, symbol);
148 
	    if(!fun) {
 148 
	    if(!fun) {
149 
		errorcall(call, "cannot resolve native routine");
 149 
		errorcall(call, "cannot resolve native routine");
150 
	    }
 150 
	    }
- 
 
 151 
	}
- 
 
 152 
 
151 
	} else if (!(*fun = R_FindSymbol(buf, dll.DLLname, symbol))) {
 153 
	if (!*fun && !(*fun = R_FindSymbol(buf, dll.DLLname, symbol))) {
152 
	    if(strlen(dll.DLLname))
 154 
	    if(strlen(dll.DLLname))
153 
		errorcall(call, "%s function name not in DLL for package %s",
 155 
		errorcall(call, "%s function name not in DLL for package %s",
154 
			   symbol->type == R_FORTRAN_SYM ? "Fortran" : "C",
156 
			   symbol->type == R_FORTRAN_SYM ? "Fortran" : "C",
155 
			   dll.DLLname);
 157 
			   dll.DLLname);
156 
	    else
 158 
	    else