Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2002-11-01 22:50:52 +0300
committerKent Mein <mein@cs.umn.edu>2002-11-01 22:50:52 +0300
commit485ae62d2c0c69e91d9de839831bd57de15252ca (patch)
tree51090f653a7196120f0b64aa7c626d6e6d3f861b /intern/keymaker
parent3dc53c7489f427c502220ddfffb79d469acb3cb8 (diff)
moved key.h to blenkey.h
Diffstat (limited to 'intern/keymaker')
-rw-r--r--intern/keymaker/Makefile2
-rw-r--r--intern/keymaker/blenkey.h (renamed from intern/keymaker/key.h)0
-rw-r--r--intern/keymaker/key.c2
-rw-r--r--intern/keymaker/key_internal.h2
-rw-r--r--intern/keymaker/keyloader.c2
5 files changed, 4 insertions, 4 deletions
diff --git a/intern/keymaker/Makefile b/intern/keymaker/Makefile
index a82c9e7c9b8..0ed35bc2b44 100644
--- a/intern/keymaker/Makefile
+++ b/intern/keymaker/Makefile
@@ -71,7 +71,7 @@ install: all debug
@[ -d $(LCGDIR)/$(LIBNAME) ] || mkdir $(LCGDIR)/$(LIBNAME)
@[ -d $(LCGDIR)/$(LIBNAME)/include ] || mkdir $(LCGDIR)/$(LIBNAME)/include
@[ -d $(LCGDIR)/$(LIBNAME)/lib ] || mkdir $(LCGDIR)/$(LIBNAME)/lib
- cp -f key.h $(LCGDIR)/$(LIBNAME)/include/blenkey.h
+ cp -f blenkey.h $(LCGDIR)/$(LIBNAME)/include/blenkey.h
cp -f $(LIB_a) $(LCGDIR)/$(LIBNAME)/lib/
$(DIR)/$(DEBUG_DIR)keyloader: $(LOADER_OBJS) $(LIB_a)
diff --git a/intern/keymaker/key.h b/intern/keymaker/blenkey.h
index e504fdf62b8..e504fdf62b8 100644
--- a/intern/keymaker/key.h
+++ b/intern/keymaker/blenkey.h
diff --git a/intern/keymaker/key.c b/intern/keymaker/key.c
index f42cdec8116..011196f3a8c 100644
--- a/intern/keymaker/key.c
+++ b/intern/keymaker/key.c
@@ -41,7 +41,7 @@
#include <stdlib.h>
#include <string.h>
-#include "key.h" /* external interface */
+#include "blenkey.h" /* external interface */
#include "key_internal.h"
char *Hexify(byte *in, unsigned int length) {
diff --git a/intern/keymaker/key_internal.h b/intern/keymaker/key_internal.h
index 66473c41482..af17afbbe6e 100644
--- a/intern/keymaker/key_internal.h
+++ b/intern/keymaker/key_internal.h
@@ -42,7 +42,7 @@
#include "openssl/ripemd.h"
#include "openssl/rc4.h"
#include "openssl/err.h"
-#include "key.h"
+#include "blenkey.h"
#include "mt19937int.h" /* Mersenne Twister (under artistic license) */
diff --git a/intern/keymaker/keyloader.c b/intern/keymaker/keyloader.c
index 0e7f717761d..4da347c32ac 100644
--- a/intern/keymaker/keyloader.c
+++ b/intern/keymaker/keyloader.c
@@ -42,7 +42,7 @@
#include <string.h>
#include "key_pyc.h" /* the Python byte code */
-#include "key.h" /* the external interface */
+#include "blenkey.h" /* the external interface */
#include "key_internal.h"
#define TESTReadKeyFile 1