diff options
Diffstat (limited to 'source/blender/python/intern/bpy_interface.c')
| -rw-r--r-- | source/blender/python/intern/bpy_interface.c | 43 |
1 files changed, 6 insertions, 37 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 3e089fffe6c..ae2f4244eac 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -1,37 +1,13 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Contributor(s): Michel Selten, Willian P. Germano, Stephen Swaney, - * Chris Keith, Chris Want, Ken Hughes, Campbell Barton - * - * ***** END GPL LICENSE BLOCK ***** - */ - + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/stat.h> - -/* grr, python redefines */ -#ifdef _POSIX_C_SOURCE -#undef _POSIX_C_SOURCE +#ifndef WIN32 +#include <dirent.h> +#else +#include "BLI_winstuff.h" #endif #include <Python.h> @@ -44,12 +20,6 @@ #include "bpy_sys.h" #include "bpy_util.h" -#ifndef WIN32 -#include <dirent.h> -#else -#include "BLI_winstuff.h" -#endif - #include "DNA_anim_types.h" #include "DNA_space_types.h" #include "DNA_text_types.h" @@ -57,7 +27,6 @@ #include "MEM_guardedalloc.h" #include "BLI_util.h" -#include "BLI_storage.h" #include "BLI_fileops.h" #include "BLI_string.h" @@ -623,7 +592,7 @@ void BPY_run_ui_scripts(bContext *C, int reload) } } #ifndef __linux__ - else if( BLI_join_dirfile(path, dirname, de->d_name), S_ISDIR(BLI_exist(path))) { + else if( BLI_join_dirfile(path, dirname, de->d_name), S_ISDIR(BLI_exists(path))) { #else else if(de->d_type==DT_DIR) { BLI_join_dirfile(path, dirname, de->d_name); |