Changeset 883b421 for zcrypt.c


Ignore:
Timestamp:
Aug 11, 2013, 4:40:51 PM (9 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Parents:
76e80de (diff), ca1fb26a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge ca1fb26a9a22aea6ecd68b0150859ef065c6afc5 into 76e80dee6b4f058b982a12b57bc4ec5220eb2e13
File:
1 edited

Legend:

Unmodified
Added
Removed
  • zcrypt.c

    r8f335a8 rca1fb26a  
    2929#include "filterproc.h"
    3030
    31 #ifndef OWL_VERSION_STRING
    32 #ifdef  GIT_VERSION
    33 #define stringify(x)       __stringify(x)
    34 #define __stringify(x)     #x
    35 #define OWL_VERSION_STRING stringify(GIT_VERSION)
    36 #else
    37 #define OWL_VERSION_STRING PACKAGE_VERSION
    38 #endif
    39 #endif /* !OWL_VERSION_STRING */
     31extern const char *version;
    4032
    4133/* Annotate functions in which the caller owns the return value and is
     
    157149      case OPT_VERSION:
    158150        /* Version */
    159         printf("This is zcrypt version %s\n", OWL_VERSION_STRING);
     151        printf("This is zcrypt version %s\n", version);
    160152        exit(0);
    161153      case OPT_HELP:
Note: See TracChangeset for help on using the changeset viewer.