From 74520bd1ef6ab4264f5e6a24269f7ac3b85b4e23 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 24 Jun 2011 15:10:34 +0000 Subject: move callbacks file out of intern (only contains 1 function but re-using it for new callback api) --- source/blender/blenlib/BLI_callbacks.h | 44 +++++++++++++++++++++++++ source/blender/blenlib/CMakeLists.txt | 2 +- source/blender/blenlib/intern/BLI_callbacks.h | 46 --------------------------- 3 files changed, 45 insertions(+), 47 deletions(-) create mode 100644 source/blender/blenlib/BLI_callbacks.h delete mode 100644 source/blender/blenlib/intern/BLI_callbacks.h (limited to 'source') diff --git a/source/blender/blenlib/BLI_callbacks.h b/source/blender/blenlib/BLI_callbacks.h new file mode 100644 index 00000000000..9f6ac0c391f --- /dev/null +++ b/source/blender/blenlib/BLI_callbacks.h @@ -0,0 +1,44 @@ +/* + * $Id: + * + * These callbacks are needed in the lib + * + * ***** 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): mar 2001 Nzc + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file blender/blenlib/intern/BLI_callbacks.h + * \ingroup bli + */ + + +#ifndef BLI_CALLBACKS_H +#define BLI_CALLBACKS_H + +// This is blenlib internal only +void callLocalErrorCallBack(const char* msg); + +#endif + diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index c6848346220..8964d02199f 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -89,6 +89,7 @@ set(SRC BLI_blenlib.h BLI_boxpack2d.h BLI_bpath.h + BLI_callbacks.h BLI_cpu.h BLI_dlrbTree.h BLI_dynlib.h @@ -132,7 +133,6 @@ set(SRC BLI_voxel.h BLI_winstuff.h PIL_time.h - intern/BLI_callbacks.h intern/dynamiclist.h ) diff --git a/source/blender/blenlib/intern/BLI_callbacks.h b/source/blender/blenlib/intern/BLI_callbacks.h deleted file mode 100644 index ad09339e61a..00000000000 --- a/source/blender/blenlib/intern/BLI_callbacks.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * blenlib/BLI_editVert.h mar 2001 Nzc - * - * These callbacks are needed in the lib - * - * $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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file blender/blenlib/intern/BLI_callbacks.h - * \ingroup bli - */ - - -#ifndef BLI_CALLBACKS_H -#define BLI_CALLBACKS_H - -// This is blenlib internal only -void callLocalErrorCallBack(const char* msg); - -#endif - -- cgit v1.2.3