diff options
| author | LaMont Jones <lamont@debian.org> | 2009-07-21 15:45:04 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2009-07-21 15:45:04 -0600 |
| commit | 7a22bb9abcb56d1010cefd204709e3888f95f735 (patch) | |
| tree | 5c38b4485f79ee8f6a9d5f9537e973f1f663f027 /disk-utils/mkswap.c | |
| parent | 4e13a18f57a5b427c559f3b466b9655db14d28f8 (diff) | |
| parent | 741064af10ec81635d708e9fb8373f96341246eb (diff) | |
| download | util-linux-old-7a22bb9abcb56d1010cefd204709e3888f95f735.tar.gz | |
Merge commit 'origin/master'
Conflicts:
AUTHORS
NEWS
config/include-Makefile.am
configure.ac
mount/lomount.c
po/POTFILES.in
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/eu.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po
po/zh_CN.po
Diffstat (limited to 'disk-utils/mkswap.c')
| -rw-r--r-- | disk-utils/mkswap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index 4acc73b2..bb97210e 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -57,7 +57,11 @@ #include "wholedisk.h" #ifdef HAVE_LIBUUID -#include <uuid/uuid.h> +# ifdef HAVE_UUID_UUID_H +# include <uuid/uuid.h> +#else +# include <uuid.h> +# endif #endif static char * program_name = "mkswap"; |