[Cvs-cvs] ccvs/src ChangeLog client.h edit.c edit.h recur...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     07/08/29 23:36:23

Modified files:
        src            : ChangeLog client.h edit.c edit.h recurse.c 

Log message:
        * edit.c (notify_check): Rename to...
        (cvs_notify_check): ...this to avoid Mac OSX symbol conflicts.
        * client.h, edit.c, edit.h, recurse.c: Change all references.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3532&r2=1.3533
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.h?cvsroot=cvs&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/edit.c?cvsroot=cvs&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/edit.h?cvsroot=cvs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.119&r2=1.120

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3532
retrieving revision 1.3533
diff -u -b -r1.3532 -r1.3533
--- ChangeLog   29 Aug 2007 23:32:29 -0000      1.3532
+++ ChangeLog   29 Aug 2007 23:36:23 -0000      1.3533
@@ -1,4 +1,11 @@
 2007-08-29  Derek Price  <address@hidden>
+       for Mark D. Baushke  <address@hidden>
+
+       * edit.c (notify_check): Rename to...
+       (cvs_notify_check): ...this to avoid Mac OSX symbol conflicts.
+       * client.h, edit.c, edit.h, recurse.c: Change all references.
+
+2007-08-29  Derek Price  <address@hidden>
 
        * mkmodules.c (in_repository): Check for CVSROOT/Emptydir rather than
        simply CVSROOT since that can match more than we like on case

Index: client.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- client.h    6 Sep 2006 17:49:44 -0000       1.63
+++ client.h    29 Aug 2007 23:36:23 -0000      1.64
@@ -64,7 +64,7 @@
 #ifdef CLIENT_SUPPORT
 /*
  * Flag variable for seeing whether the server has been started yet.
- * As of this writing, only edit.c:notify_check() uses it.
+ * As of this writing, only edit.c:cvs_notfiy_check() uses it.
  */
 extern int server_started;
 

Index: edit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/edit.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- edit.c      27 Aug 2007 02:11:05 -0000      1.97
+++ edit.c      29 Aug 2007 23:36:23 -0000      1.98
@@ -151,7 +151,7 @@
 dummy_fileproc (void *callerdat, struct file_info *finfo)
 {
     /* This is a pretty hideous hack, but the gist of it is that recurse.c
-       won't call notify_check unless there is a fileproc, so we can't just
+       won't call cvs_notfiy_check unless there is a fileproc, so we can't just
        pass NULL for fileproc.  */
     return 0;
 }
@@ -1157,7 +1157,7 @@
 #ifdef CLIENT_SUPPORT
 /* Check and send notifications.  This is only for the client.  */
 void
-notify_check (const char *repository, const char *update_dir)
+cvs_notfiy_check (const char *repository, const char *update_dir)
 {
     FILE *fp;
     char *line = NULL;

Index: edit.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/edit.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- edit.h      24 Apr 2006 18:50:26 -0000      1.13
+++ edit.h      29 Aug 2007 23:36:23 -0000      1.14
@@ -28,7 +28,7 @@
 /* Check to see if any notifications are sitting around in need of being
    sent.  These are the notifications stored in CVSADM_NOTIFY (edit,unedit);
    commit calls notify_do directly.  */
-void notify_check (const char *repository, const char *update_dir);
+void cvs_notfiy_check (const char *repository, const char *update_dir);
 #endif /* CLIENT_SUPPORT */
 
 /* Issue a notification for file FILENAME.  TYPE is 'E' for edit, 'U'

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- recurse.c   29 Aug 2007 19:05:09 -0000      1.119
+++ recurse.c   29 Aug 2007 23:36:23 -0000      1.120
@@ -856,7 +856,7 @@
           have writelocks in place, and there is no way to get writelocks
           here.  */
        if (current_parsed_root->isremote)
-           notify_check (repository, update_dir);
+           cvs_notfiy_check (repository, update_dir);
 #endif /* CLIENT_SUPPORT */
 
        finfo_struct.repository = repository;