diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-13 00:43:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:22:58 -0500 |
| commit | 8fc8fa2ad4e38751205afc089c957d38e5fc9384 (patch) | |
| tree | 7195be3cdb4209bf9572e9ee48c48c62a43f9cde /source4/lib/appweb/mpr | |
| parent | b4f6a348bb512071af685f4c9e0fe86f6eb81a75 (diff) | |
| download | samba-8fc8fa2ad4e38751205afc089c957d38e5fc9384.tar.gz samba-8fc8fa2ad4e38751205afc089c957d38e5fc9384.tar.bz2 samba-8fc8fa2ad4e38751205afc089c957d38e5fc9384.zip | |
r8404: small upstream merges of appweb code
(This used to be commit 205ff9a82bd51eae3c1400ea0a24fcf2a662e96f)
Diffstat (limited to 'source4/lib/appweb/mpr')
| -rw-r--r-- | source4/lib/appweb/mpr/miniMpr.h | 2 | ||||
| -rw-r--r-- | source4/lib/appweb/mpr/var.h | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/source4/lib/appweb/mpr/miniMpr.h b/source4/lib/appweb/mpr/miniMpr.h index a0030b25b5..8b28472826 100644 --- a/source4/lib/appweb/mpr/miniMpr.h +++ b/source4/lib/appweb/mpr/miniMpr.h @@ -273,6 +273,8 @@ extern int mprMemcpy(char *dest, int destMax, const char *src, int nbytes); extern void mprSetCtx(void *ctx); extern void *mprMemCtx(void); +#define mprStrCmpAnyCase(s1, s2) StrCaseCmp(s1, s2) + #ifdef __cplusplus } #endif diff --git a/source4/lib/appweb/mpr/var.h b/source4/lib/appweb/mpr/var.h index 8ed13a4995..ef9217b9cf 100644 --- a/source4/lib/appweb/mpr/var.h +++ b/source4/lib/appweb/mpr/var.h @@ -156,10 +156,6 @@ typedef BLD_FEATURE_NUM_TYPE MprNum; #define MPR_MAX_VAR 512 #endif -#ifndef __NO_PACK -#pragma pack(2) -#endif /* _NO_PACK */ - /* * Function signatures */ @@ -348,11 +344,6 @@ typedef struct MprVar { typedef BLD_FEATURE_NUM_TYPE MprNumber; - -#ifndef __NO_PACK -#pragma pack() -#endif /* __NO_PACK */ - /********************************* Prototypes *********************************/ /* * Variable constructors and destructors |