Christopher R. Hertel a0082c340a I've come up with a different scheme for doing the DEBUG() and DEBUGADD() ...

macros that meets the RVALUE requirement and doesn't use the (a?b:c) format
that Andrew called "ugly".  I've added the new macros but kept the old
macros within a #if 0..#else..#endif block in case I've missed somthing.

Basically, I've used

  (void)( (a) && (b) )

or

  (void)( (a) && (b) && (c) )

instead of

  ( (a) ? (void)(b) : (void)(c) )

or similar.  I have this compiled and running now.

Here's the diff:

$ cvs diff smb.h
Enter passphrase for RSA key 'crh@Ruby':
Index: smb.h
===================================================================
RCS file: /data/cvs/samba/source/include/smb.h,v
retrieving revision 1.172
diff -r1.172 smb.h
143a144,145
> #if 0
>
150a153,164
>
> #else
>
> #define DEBUG( level, body ) \
>   (void)( (DEBUGLEVEL >= (level)) \
>        && (dbghdr( level, FILE_MACRO, FUNCTION_MACRO, (__LINE__) )) \
>        && (dbgtext body) )
>
> #define DEBUGADD( level, body ) \
>   (void)( (DEBUGLEVEL >= (level)) && (dbgtext body) )
>
> #endif

Chris -)-----
(This used to be commit 53b433e6ab9fd69a02016ee4f2a3f756640ea565)

1998-08-11 18:56:03 +00:00

..

.cvsignore

added ignore rules for the dummy files

1998-08-09 11:25:49 +00:00

byteorder.h

This is *not* a big change (although it looks like one).

1998-01-22 13:27:43 +00:00

charset.h

This is *not* a big change (although it looks like one).

1998-01-22 13:27:43 +00:00

clitar.h

Initial version imported to CVS

1996-05-04 07:50:46 +00:00

config.h.in

the autoconf scripts are now converted to the new directory structure

1998-08-09 11:23:13 +00:00

dummy.in

some merge cleanups

1998-07-29 03:15:02 +00:00

includes.h

test for a broken inet_ntoa and replace it if necessary (for

1998-07-29 07:02:06 +00:00

kanji.h

Added codepage 936 (simplified Chineses).

1998-04-09 00:07:17 +00:00

local.h

this gets smbd compiling and linking correctly with the new layout.

1998-08-09 13:25:34 +00:00

nameserv.h

Converted the browser database to a ubi_dLinkList. This should reduce code

1998-07-24 19:03:11 +00:00

ntdomain.h

this gets smbd compiling and linking correctly with the new layout.

1998-08-09 13:25:34 +00:00

nterr.h

Makefile.in: Added CHECK target back in (at Herb's request). Added

1998-08-11 02:13:01 +00:00

proto.h

moved access.c into lib/ from smbd/ as it is needed by testparm. I

1998-08-10 07:29:57 +00:00

rpc_dce.h

includes.h: Moved HPUX undefine of SEMMSL to where it actually does something.

1998-04-10 18:21:16 +00:00

rpc_lsa.h

loadparm.c: Removed 'domain other sids' parameter.

1998-06-09 02:26:26 +00:00

rpc_misc.h

Makefile: Added CC=gcc to DGUX on Intel. Comment from ross@filmworks.com.

1998-07-16 00:06:29 +00:00

rpc_netlogon.h

This is the checkin that adds the security=domain functionality.

1998-04-29 00:02:57 +00:00

rpc_reg.h

"For I have laboured mightily on Luke's code, and hath broken

1998-03-11 21:11:04 +00:00

rpc_samr.h

"For I have laboured mightily on Luke's code, and hath broken

1998-03-11 21:11:04 +00:00

rpc_srvsvc.h

dce/rpc net time command from jean-francois. does not support timezones

1998-05-20 13:17:26 +00:00

rpc_wkssvc.h

"For I have laboured mightily on Luke's code, and hath broken

1998-03-11 21:11:04 +00:00

smb.h

I've come up with a different scheme for doing the DEBUG() and DEBUGADD()

1998-08-11 18:56:03 +00:00

trans2.h

smb.h: More NT SMB stuff (just defines).

1998-05-26 19:37:31 +00:00

version.h

Makefile: Added genrand.o

1998-04-20 22:43:54 +00:00

vt_mode.h

Initial version imported to CVS

1996-05-04 07:50:46 +00:00