diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2004-01-03 02:15:30 +0300 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2004-01-03 02:15:30 +0300 |
| commit | 251c11cca15cc1ae2736546167edd47bd30a2485 (patch) | |
| tree | 7ca02e75151f10aabb2d1044b297e318b7c97c93 /source | |
| parent | a2f096236beef605228ec3d50288e97f6349ca6f (diff) | |
- BLO_keyStore.h was redeclaring UserStructType from blenkey.h, removed
duplicate definition and include blenkey.h where needed. (VC7 patch)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/encrypt/intern/BLO_encrypt.c | 1 | ||||
| -rw-r--r-- | source/blender/readstreamglue/BLO_keyStore.h | 12 | ||||
| -rw-r--r-- | source/blender/sign/intern/BLO_sign.c | 1 | ||||
| -rw-r--r-- | source/blender/writestreamglue/intern/BLO_getPubKey.c | 1 |
4 files changed, 3 insertions, 12 deletions
diff --git a/source/blender/encrypt/intern/BLO_encrypt.c b/source/blender/encrypt/intern/BLO_encrypt.c index 3353a1fd69f..91ee4b12fa4 100644 --- a/source/blender/encrypt/intern/BLO_encrypt.c +++ b/source/blender/encrypt/intern/BLO_encrypt.c @@ -50,6 +50,7 @@ #include "GEN_messaging.h" +#include "blenkey.h" #include "BLO_keyStore.h" #include "BLO_writeStreamGlue.h" #include "BLO_en_de_cryptHeader.h" diff --git a/source/blender/readstreamglue/BLO_keyStore.h b/source/blender/readstreamglue/BLO_keyStore.h index afc22206eb9..594ef9aff74 100644 --- a/source/blender/readstreamglue/BLO_keyStore.h +++ b/source/blender/readstreamglue/BLO_keyStore.h @@ -38,18 +38,6 @@ extern "C" { #endif -typedef unsigned char byte; - -typedef struct UserStructType { - char name[100]; - char email[100]; - char shopid[100]; - unsigned long reldate; - int keytype; /* 1 = Individual, 2 = Corporate, 3 = Unlimited */ - int keylevel; /* key disclosure level, starts at 1 */ - int keyformat; /* if we change the keyformat, up BLENKEYFORMAT */ -} UserStruct; - void keyStoreConstructor( UserStruct *keyUserStruct, diff --git a/source/blender/sign/intern/BLO_sign.c b/source/blender/sign/intern/BLO_sign.c index 29bc00ebbd9..ff9bff56067 100644 --- a/source/blender/sign/intern/BLO_sign.c +++ b/source/blender/sign/intern/BLO_sign.c @@ -50,6 +50,7 @@ #include "GEN_messaging.h" +#include "blenkey.h" #include "BLO_keyStore.h" #include "BLO_writeStreamGlue.h" #include "BLO_sign_verify_Header.h" diff --git a/source/blender/writestreamglue/intern/BLO_getPubKey.c b/source/blender/writestreamglue/intern/BLO_getPubKey.c index 99193417591..d8115384886 100644 --- a/source/blender/writestreamglue/intern/BLO_getPubKey.c +++ b/source/blender/writestreamglue/intern/BLO_getPubKey.c @@ -34,6 +34,7 @@ #include <stdlib.h> #include <string.h> +#include "blenkey.h" #include "BLO_keyStore.h" #include "BLO_getPubKey.h" |