[ctypes-commit] misc/misc import.c,1.3,1.4

[Thomas H. <th...@us...>]

Update of /cvsroot/ctypes/misc/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20790

Modified Files:
	import.c 
Log Message:
*** empty log message ***

Index: import.c
===================================================================
RCS file: /cvsroot/ctypes/misc/misc/import.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** import.c	4 Jan 2005 12:48:01 -0000	1.3
--- import.c	4 Jan 2005 18:28:01 -0000	1.4
***************
*** 2,5 ****
--- 2,7 ----
    import.17.c - test suite works with new test
                  some cleanup and error checking
+   import.18.c - passes (most) tests on OSX on SF compile farm.
+                 more cleanup.
   */
  
***************
*** 1393,1406 ****
  }
  
! /* case_ok(char* buf, int len, int namelen, char* name)
!  * The arguments here are tricky, best shown by example:
!  *    /a/b/c/d/e/f/g/h/i/j/k/some_long_module_name.py\0
!  *    ^                      ^                   ^    ^
!  *    |--------------------- buf ---------------------|
!  *    |------------------- len ------------------|
!  *                           |------ name -------|
!  *                           |----- namelen -----|
!  * buf is the full path, but len only counts up to (& exclusive of) the
!  * extension.  name is the module name, also exclusive of extension.
   *
   * We've already done a successful stat() or fopen() on buf, so know that
--- 1395,1399 ----
  }
  
! /* case_ok(PyObject *fname, char* name)
   *
   * We've already done a successful stat() or fopen() on buf, so know that
***************
*** 1417,1435 ****
   */
  
- /* First we may need a pile of platform-specific header files; the sequence
-  * of #if's here should match the sequence in the body of case_ok().
-  */
- #if defined(MS_WINDOWS) || defined(__CYGWIN__)
- 
- #elif defined(DJGPP)
- 
- #elif defined(__MACH__) && defined(__APPLE__) && defined(HAVE_DIRENT_H)
- 
- #elif defined(PYOS_OS2)
- 
- #elif defined(RISCOS)
- 
- #endif
- 
  /* MS_WINDOWS || __CYGWIN__ */
  #if defined(MS_WINDOWS) || defined(__CYGWIN__)
--- 1410,1413 ----
***************
*** 1533,1537 ****
  	struct dirent *dp;
  	char dirname[MAXPATHLEN + 1];
- 	int dirlen;
  	char *nameWithExt;
  	
--- 1511,1514 ----