diff options
Diffstat (limited to 'merge')
| -rw-r--r-- | merge/Makefile.am | 8 | ||||
| -rw-r--r-- | merge/mrg_close.c (renamed from merge/close.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_create.c (renamed from merge/create.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_def.h (renamed from merge/mrgdef.h) | 0 | ||||
| -rw-r--r-- | merge/mrg_delete.c (renamed from merge/delete.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_extra.c (renamed from merge/extra.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_info.c (renamed from merge/info.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_locking.c (renamed from merge/_locking.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_open.c (renamed from merge/open.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_panic.c (renamed from merge/panic.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_rrnd.c (renamed from merge/rrnd.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_rsame.c (renamed from merge/rsame.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_static.c (renamed from merge/static.c) | 2 | ||||
| -rw-r--r-- | merge/mrg_update.c (renamed from merge/update.c) | 2 |
14 files changed, 16 insertions, 16 deletions
diff --git a/merge/Makefile.am b/merge/Makefile.am index 52abfc4cdc0..94de6d65391 100644 --- a/merge/Makefile.am +++ b/merge/Makefile.am @@ -16,10 +16,10 @@ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include pkglib_LIBRARIES = libmerge.a -noinst_HEADERS = mrgdef.h -libmerge_a_SOURCES = open.c extra.c info.c _locking.c \ - rrnd.c update.c delete.c rsame.c panic.c \ - close.c create.c static.c +noinst_HEADERS = mrg_def.h +libmerge_a_SOURCES = mrg_open.c mrg_extra.c mrg_info.c mrg_locking.c \ + mrg_rrnd.c mrg_update.c mrg_delete.c mrg_rsame.c \ + mrg_panic.c mrg_close.c mrg_create.c mrg_static.c OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ __math.h time.h __time.h unistd.h __unistd.h types.h \ diff --git a/merge/close.c b/merge/mrg_close.c index 2b769ade8e9..4879dbf4c36 100644 --- a/merge/close.c +++ b/merge/mrg_close.c @@ -16,7 +16,7 @@ /* close a isam-database */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_close(register MRG_INFO *info) { diff --git a/merge/create.c b/merge/mrg_create.c index fd2c16f9ea2..d92b617f4ba 100644 --- a/merge/create.c +++ b/merge/mrg_create.c @@ -16,7 +16,7 @@ /* Create a MERGE-file */ -#include "mrgdef.h" +#include "mrg_def.h" /* create file named 'name' and save filenames in it table_names should be NULL or a vector of string-pointers with diff --git a/merge/mrgdef.h b/merge/mrg_def.h index 3f22c83589a..3f22c83589a 100644 --- a/merge/mrgdef.h +++ b/merge/mrg_def.h diff --git a/merge/delete.c b/merge/mrg_delete.c index a4ee46eedc2..4eb19957c63 100644 --- a/merge/delete.c +++ b/merge/mrg_delete.c @@ -16,7 +16,7 @@ /* Delete last read record */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_delete(MRG_INFO *info,const byte *record) { diff --git a/merge/extra.c b/merge/mrg_extra.c index c4f048a4385..ace931f5810 100644 --- a/merge/extra.c +++ b/merge/mrg_extra.c @@ -20,7 +20,7 @@ record-cache-flags are set in mrg_rrnd when we are changing database. */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_extra( MRG_INFO *info, diff --git a/merge/info.c b/merge/mrg_info.c index d44ada8e6e6..981d1975fea 100644 --- a/merge/info.c +++ b/merge/mrg_info.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mrgdef.h" +#include "mrg_def.h" ulong mrg_position(MRG_INFO *info) { diff --git a/merge/_locking.c b/merge/mrg_locking.c index 81582da1312..13ccb09bbe6 100644 --- a/merge/_locking.c +++ b/merge/mrg_locking.c @@ -18,7 +18,7 @@ Lock databases against read or write. */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_lock_database(MRG_INFO *info,int lock_type) { diff --git a/merge/open.c b/merge/mrg_open.c index 7b5e571b9ad..708e56e1a81 100644 --- a/merge/open.c +++ b/merge/mrg_open.c @@ -16,7 +16,7 @@ /* open a MERGE-database */ -#include "mrgdef.h" +#include "mrg_def.h" #include <stddef.h> #include <errno.h> #ifdef VMS diff --git a/merge/panic.c b/merge/mrg_panic.c index cf333e3a9bf..dd9b8bf4e0f 100644 --- a/merge/panic.c +++ b/merge/mrg_panic.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mrgdef.h" +#include "mrg_def.h" /* if flag == HA_PANIC_CLOSE then all misam files are closed */ /* if flag == HA_PANIC_WRITE then all misam files are unlocked and diff --git a/merge/rrnd.c b/merge/mrg_rrnd.c index e53982aca21..42430a039f7 100644 --- a/merge/rrnd.c +++ b/merge/mrg_rrnd.c @@ -19,7 +19,7 @@ get by mrg_info(). The next record can be read with pos= -1 */ -#include "mrgdef.h" +#include "mrg_def.h" static MRG_TABLE *find_table(MRG_TABLE *start,MRG_TABLE *end,mrg_off_t pos); diff --git a/merge/rsame.c b/merge/mrg_rsame.c index 4ebf25b21c1..307e4284486 100644 --- a/merge/rsame.c +++ b/merge/mrg_rsame.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_rsame( diff --git a/merge/static.c b/merge/mrg_static.c index e5f95ef195a..793dc8c4d92 100644 --- a/merge/static.c +++ b/merge/mrg_static.c @@ -20,7 +20,7 @@ */ #ifndef stdin -#include "mrgdef.h" +#include "mrg_def.h" #endif LIST *mrg_open_list=0; diff --git a/merge/update.c b/merge/mrg_update.c index 9fcb82089e4..88f8572eb7d 100644 --- a/merge/update.c +++ b/merge/mrg_update.c @@ -16,7 +16,7 @@ /* Update last read record */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_update( register MRG_INFO *info, |