[5985] in Athena Bugs

home help back first fref pref prev next nref lref last post

discuss files not ifdef'd correctly

daemon@ATHENA.MIT.EDU (lwvanels@MIT.EDU)
Sat Sep 8 21:25:35 1990

From: lwvanels@MIT.EDU
Date: Sat, 8 Sep 90 21:25:17 -0400
To: bugs@ATHENA.MIT.EDU

The files in server directory won't compile unless ZEPHYR is defined; the
files:

/source/third/common/discuss-1.5a/source/server/expunge.c
/source/third/common/discuss-1.5a/source/server/recover.c

are missing an #ifdef ZEPHYR around use_zephyr.  These are the patches:

diff -c /source/third/common/discuss-1.5a/source/server/expunge.c ./expunge.c
*** /source/third/common/discuss-1.5a/source/server/expunge.c	Sat Jun  3 00:43:12 1989
--- ./expunge.c	Sat Sep  8 20:53:02 1990
***************
*** 43,49 ****
  extern char rpc_caller[];
  extern int has_privs;
  extern int errno;
! extern int no_nuke, use_zephyr;
  
  main (argc, argv)
  int argc;
--- 43,52 ----
  extern char rpc_caller[];
  extern int has_privs;
  extern int errno;
! extern int no_nuke;
! #ifdef ZEPHYR
! extern int use_zephyr;
! #endif
  
  main (argc, argv)
  int argc;
***************
*** 91,97 ****
--- 94,102 ----
  	  goto lusage;					/* required */
  
       has_privs = TRUE;		/* Tell discuss we're special */
+ #ifdef ZEPHYR
       use_zephyr = 0;		/* Don't notify of every trn copied */
+ #endif
       strcpy (rpc_caller, "expunger");
  
       /* First, we get the mtg info to make sure it exists */
diff -c /source/third/common/discuss-1.5a/source/server/recover.c ./recover.c
*** /source/third/common/discuss-1.5a/source/server/recover.c	Sat Jun  3 00:43:35 1989
--- ./recover.c	Sat Sep  8 20:51:50 1990
***************
*** 46,52 ****
  static fsize(),read_trn_hdr(),read_last_trn(),save_trn();
  
  extern char rpc_caller[];
! extern int has_privs, use_zephyr;
  
  main (argc, argv)
  int argc;
--- 46,55 ----
  static fsize(),read_trn_hdr(),read_last_trn(),save_trn();
  
  extern char rpc_caller[];
! extern int has_privs;
! #ifdef ZEPHYR
! extern int use_zephyr;
! #endif
  
  main (argc, argv)
  int argc;
***************
*** 55,61 ****
--- 58,66 ----
       int i;
  
       has_privs = TRUE;
+ #ifdef ZEPHYR
       use_zephyr = 0;
+ #endif
  
       for (i = 1; i < argc; i++) {
  	  if (*argv[i] == '-') switch (argv[i][1]) {


home help back first fref pref prev next nref lref last post