Merge branch 'master' of 192.168.0.7:/home/tim/gitsrc/magic/
Missed a pull.
This commit is contained in:
commit
4a1752aa61
|
|
@ -26,6 +26,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
#include "tcltk/tclmagic.h"
|
#include "tcltk/tclmagic.h"
|
||||||
#include "utils/magic.h"
|
#include "utils/magic.h"
|
||||||
|
|
@ -220,6 +221,7 @@ cifHierCleanup()
|
||||||
* ----------------------------------------------------------------------------
|
* ----------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
int
|
||||||
cifMaskHints(name, value, targetDef)
|
cifMaskHints(name, value, targetDef)
|
||||||
char *name;
|
char *name;
|
||||||
char *value;
|
char *value;
|
||||||
|
|
@ -296,6 +298,7 @@ typedef struct _maskHintsData
|
||||||
* ----------------------------------------------------------------------------
|
* ----------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
int
|
||||||
cifFlatMaskHints(name, value, mhd)
|
cifFlatMaskHints(name, value, mhd)
|
||||||
char *name;
|
char *name;
|
||||||
char *value;
|
char *value;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue