Changeset 18074
- Timestamp:
- 2008-12-04T14:08:23+13:00 (15 years ago)
- Location:
- gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/gdbmclose.c
r18019 r18074 50 50 if (dbf->file_locking) 51 51 { 52 #ifdef MSDOS 53 if (dbf->need_filelock) { 54 UNLOCK_FILE(dbf); 55 } 56 #else 52 57 UNLOCK_FILE(dbf); 58 #endif 53 59 } 54 60 close (dbf->desc); -
gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/gdbmdefs.h
r18019 r18074 170 170 void (*fatal_err) (); 171 171 172 #ifdef MSDOS 173 int need_filelock; 174 #endif 175 172 176 /* The gdbm file descriptor which is set in gdbm_open. */ 173 177 int desc; -
gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/gdbmopen.c
r18064 r18074 58 58 59 59 gdbm_file_info * 60 #ifdef MSDOS 61 gdbm_open (file, block_size, flags, mode, fatal_func, need_filelock) 62 #else 60 63 gdbm_open (file, block_size, flags, mode, fatal_func) 64 #endif 61 65 char *file; 62 66 int block_size; … … 64 68 int mode; 65 69 void (*fatal_func) (); 70 #ifdef MSDOS 71 int need_filelock; 72 #endif 66 73 { 67 74 gdbm_file_info *dbf; /* The record to return. */ … … 89 96 /* Initialize some fields for known values. This is done so gdbm_close 90 97 will work if called before allocating some structures. */ 98 #ifdef MSDOS 99 dbf->need_filelock = need_filelock; 100 #endif 91 101 dbf->dir = NULL; 92 102 dbf->bucket = NULL; … … 187 197 if (dbf->file_locking) 188 198 { 189 /* Sets lock_val to 0 for success. See systems.h. */ 190 READLOCK_FILE(dbf); 199 /* Sets lock_val to 0 for success. See systems.h. */ 200 #ifdef MSDOS 201 if (dbf->need_filelock) { 202 READLOCK_FILE(dbf); 203 } 204 else { 205 lock_val = 0; 206 } 207 #else 208 READLOCK_FILE(dbf); 209 #endif 191 210 } 192 211 } … … 194 213 { 195 214 /* Sets lock_val to 0 for success. See systems.h. */ 215 #ifdef MSDOS 216 if (dbf->need_filelock) { 217 WRITELOCK_FILE(dbf); 218 } 219 else { 220 lock_val = 0; 221 } 222 #else 196 223 WRITELOCK_FILE(dbf); 224 #endif 197 225 } 198 226 if (dbf->file_locking && (lock_val != 0)) -
gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/gdbmreorg.c
r18060 r18074 182 182 if (dbf->file_locking) 183 183 { 184 #ifdef MSDOS 185 if (dbf->need_filelock) { 186 UNLOCK_FILE(dbf); 187 } 188 #else 184 189 UNLOCK_FILE(dbf); 190 #endif 185 191 } 186 192 close (dbf->desc); -
gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/proto.h
r18019 r18074 65 65 int gdbm_delete __P((gdbm_file_info *, datum)); 66 66 datum gdbm_fetch __P((gdbm_file_info *, datum)); 67 #ifdef MSDOS 68 gdbm_file_info *gdbm_open __P((char *, int, int, int, void (*) (void), int)); 69 #else 67 70 gdbm_file_info *gdbm_open __P((char *, int, int, int, void (*) (void))); 71 #endif 68 72 int gdbm_reorganize __P((gdbm_file_info *)); 69 73 datum gdbm_firstkey __P((gdbm_file_info *)); -
gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/windows/gdbm.h
r18058 r18074 83 83 /* These are the routines! */ 84 84 85 #ifdef MSDOS 86 extern GDBM_FILE gdbm_open __P((char *, int, int, int, void (*)(), int)); 87 #else 85 88 extern GDBM_FILE gdbm_open __P((char *, int, int, int, void (*)())); 89 #endif 86 90 extern void gdbm_close __P((GDBM_FILE)); 87 91 extern int gdbm_store __P((GDBM_FILE, datum, datum, int));
Note:
See TracChangeset
for help on using the changeset viewer.