[Amizilla-cvs] amizilla/modules/libreg/src VerReg.c,1.1.1.1,1.2 vr_stubs.c,1.1.1.2,1.2
Brought to you by:
maxlarsson
Menu
▾
▴
[Amizilla-cvs] amizilla/modules/libreg/src VerReg.c,1.1.1.1,1.2 vr_stubs.c,1.1.1.2,1.2
|
From: Jeff S. <jsh...@us...> - 2004-10-11 21:01:22
|
Update of /cvsroot/amizilla/amizilla/modules/libreg/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30815 Modified Files: VerReg.c vr_stubs.c Log Message: AmigaOS defines. Index: VerReg.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/modules/libreg/src/VerReg.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** VerReg.c 22 Jun 2003 11:53:24 -0000 1.1.1.1 --- VerReg.c 11 Oct 2004 21:00:35 -0000 1.2 *************** *** 102,106 **** ! #if defined(XP_UNIX) && !defined(XP_MACOSX) /* Extra Unix variables to deal with two registries * "vreg" is always the writable registry. --- 102,106 ---- ! #if (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) /* Extra Unix variables to deal with two registries * "vreg" is always the writable registry. *************** *** 155,163 **** REGERR err = REGERR_OK; char *regname = vr_findVerRegName(); ! #if defined(XP_UNIX) && !defined(XP_MACOSX) || defined(STANDALONE_REGISTRY) char curstr[MAXREGNAMELEN]; RKEY navKey; #endif ! #if defined(XP_UNIX) && !defined(XP_MACOSX) char *regbuf = NULL; #endif --- 155,163 ---- REGERR err = REGERR_OK; char *regname = vr_findVerRegName(); ! #if (defined(XP_UNIX) || defined (XP_AMIGAOS)) && !defined(XP_MACOSX) || defined(STANDALONE_REGISTRY) char curstr[MAXREGNAMELEN]; RKEY navKey; #endif ! #if (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) char *regbuf = NULL; #endif *************** *** 171,175 **** if (!isInited) { ! #if defined(XP_UNIX) && !defined(XP_MACOSX) /* need browser directory to find the correct registry */ if (app_dir != NULL) { --- 171,175 ---- if (!isInited) { ! #if (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) /* need browser directory to find the correct registry */ if (app_dir != NULL) { *************** *** 205,209 **** } ! #if defined(XP_UNIX) && !defined(XP_MACOSX) /* try to open shared Unix registry, but not an error if you can't */ unixreg = NULL; --- 205,209 ---- } ! #if (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) /* try to open shared Unix registry, but not an error if you can't */ unixreg = NULL; *************** *** 263,267 **** done: PR_Unlock(vr_lock); ! #if defined(XP_UNIX) && !defined(XP_MACOSX) && !defined(STANDALONE_REGISTRY) XP_FREEIF(regbuf); #endif --- 263,267 ---- done: PR_Unlock(vr_lock); ! #if (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) && !defined(STANDALONE_REGISTRY) XP_FREEIF(regbuf); #endif *************** *** 285,288 **** --- 285,291 ---- #endif + #ifdef XP_AMIGAOS + #define VR_FILE_SEP '/' + #endif static XP_Bool vr_CompareDirs( char *dir1, char *dir2 ) { *************** *** 641,645 **** RKEY rootkey; ! #if !defined(STANDALONE_REGISTRY) && defined(XP_UNIX) && !defined(XP_MACOSX) if (unixreg != NULL) { *hreg = unixreg; --- 644,648 ---- RKEY rootkey; ! #if !defined(STANDALONE_REGISTRY) && (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) if (unixreg != NULL) { *hreg = unixreg; *************** *** 697,701 **** REGERR err; char * regname = vr_findVerRegName(); ! #if defined(XP_UNIX) && !defined(XP_MACOSX) char * regbuf = NULL; #endif --- 700,704 ---- REGERR err; char * regname = vr_findVerRegName(); ! #if (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) char * regbuf = NULL; #endif *************** *** 704,708 **** return REGERR_PARAM; ! #if defined(XP_UNIX) && !defined(XP_MACOSX) #ifndef STANDALONE_REGISTRY if (bGlobalRegistry) --- 707,711 ---- return REGERR_PARAM; ! #if (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) #ifndef STANDALONE_REGISTRY if (bGlobalRegistry) *************** *** 738,742 **** PR_Unlock(vr_lock); ! #if defined(XP_UNIX) && !defined(XP_MACOSX) XP_FREEIF( regbuf ); #endif --- 741,745 ---- PR_Unlock(vr_lock); ! #if (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) XP_FREEIF( regbuf ); #endif *************** *** 758,762 **** if (isInited) { ! #if !defined(STANDALONE_REGISTRY) && defined(XP_UNIX) && !defined(XP_MACOSX) if ( unixreg != NULL ) NR_RegClose( unixreg ); --- 761,765 ---- if (isInited) { ! #if !defined(STANDALONE_REGISTRY) && (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) if ( unixreg != NULL ) NR_RegClose( unixreg ); Index: vr_stubs.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/modules/libreg/src/vr_stubs.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** vr_stubs.c 29 Jun 2004 11:04:34 -0000 1.1.1.2 --- vr_stubs.c 11 Oct 2004 21:00:35 -0000 1.2 *************** *** 397,401 **** } #else ! extern char* vr_findVerRegName() { FSSpec regSpec; --- 397,401 ---- } #else ! char* vr_findVerRegName() { FSSpec regSpec; *************** *** 594,598 **** /*allow OS/2 and Macintosh to use this main to test...*/ ! #if (defined(STANDALONE_REGISTRY) && defined(XP_MAC)) || defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) #include <stdlib.h> --- 594,598 ---- /*allow OS/2 and Macintosh to use this main to test...*/ ! #if (defined(STANDALONE_REGISTRY) && defined(XP_MAC)) || defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) || defined(XP_AMIGAOS) #include <stdlib.h> *************** *** 620,624 **** REGERR vr_ParseVersion(char *verstr, VERSION *result); ! #if defined(XP_UNIX) && !defined(XP_MACOSX) #ifdef STANDALONE_REGISTRY --- 620,624 ---- REGERR vr_ParseVersion(char *verstr, VERSION *result); ! #if (defined(XP_UNIX) || defined(XP_AMIGAOS)) && !defined(XP_MACOSX) #ifdef STANDALONE_REGISTRY |